From b294ed637d3c13cd96ba6f0e464e02e170cc54a6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 11 Sep 2010 11:47:09 -0700 Subject: 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 --- builtin/ls-tree.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'builtin') 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; -- cgit v1.2.1