diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:41:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:41:13 -0700 |
| commit | 2e1e96126f93653badaa0afd17204e417dfc8e7d (patch) | |
| tree | 3362bf9a25af51705604515307bc87975f6952d0 /builtin/ls-tree.c | |
| parent | 0c61c6de3497900616b66a65dc41b27544131ed5 (diff) | |
| parent | b294ed637d3c13cd96ba6f0e464e02e170cc54a6 (diff) | |
| download | git-2e1e96126f93653badaa0afd17204e417dfc8e7d.tar.gz | |
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/ls-tree.c')
| -rw-r--r-- | builtin/ls-tree.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index dc86b0d9a9..a8187568bf 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; |