diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-11 18:47:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-12 20:52:03 (GMT) |
| commit | b294ed637d3c13cd96ba6f0e464e02e170cc54a6 (patch) | |
| tree | f5606a75fdfbfb5c1cdf35def8ccc2ff7ae103ff /builtin/ls-tree.c | |
| parent | 9904fadfea002edf2ef22e8ec9a978e45d1f540b (diff) | |
| download | git-b294ed637d3c13cd96ba6f0e464e02e170cc54a6.zip git-b294ed637d3c13cd96ba6f0e464e02e170cc54a6.tar.gz git-b294ed637d3c13cd96ba6f0e464e02e170cc54a6.tar.bz2 | |
ls-tree $di $dir: do not mistakenly recurse into directories
When applying two pathspecs, one of which is named as a prefix to the
other, we mistakenly recursed into the shorter one.
Noticed and fixed by David Reis.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 dc86b0d..a818756 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; |