Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'
commit2e1e96126f93653badaa0afd17204e417dfc8e7d
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Sep 2010 19:41:13 +0000 (15 12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Sep 2010 19:41:13 +0000 (15 12:41 -0700)
tree3362bf9a25af51705604515307bc87975f6952d0
parent0c61c6de3497900616b66a65dc41b27544131ed5
parentb294ed637d3c13cd96ba6f0e464e02e170cc54a6
Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'

* dr/maint-ls-tree-prefix-recursion-fix:
  ls-tree $di $dir: do not mistakenly recurse into directories