aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-15 12:41:13 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-15 12:41:13 -0700
commit2e1e96126f93653badaa0afd17204e417dfc8e7d (patch)
tree3362bf9a25af51705604515307bc87975f6952d0 /builtin
parent0c61c6de3497900616b66a65dc41b27544131ed5 (diff)
parentb294ed637d3c13cd96ba6f0e464e02e170cc54a6 (diff)
downloadgit-2e1e96126f93653badaa0afd17204e417dfc8e7d.tar.gz
git-2e1e96126f93653badaa0afd17204e417dfc8e7d.tar.xz
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
Diffstat (limited to 'builtin')
-rw-r--r--builtin/ls-tree.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index dc86b0d9a..a8187568b 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -52,6 +52,8 @@ static int show_recursive(const char *base, int baselen, const char *pathname)
speclen = strlen(spec);
if (speclen <= len)
continue;
+ if (spec[len] && spec[len] != '/')
+ continue;
if (memcmp(pathname, spec, len))
continue;
return 1;