From b294ed637d3c13cd96ba6f0e464e02e170cc54a6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 11 Sep 2010 11:47:09 -0700 Subject: [PATCH] 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 ++ t/t3100-ls-tree-restrict.sh | 9 +++++++++ 2 files changed, 11 insertions(+) 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; diff --git a/t/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh index eee0d344d..81d90b66c 100755 --- a/t/t3100-ls-tree-restrict.sh +++ b/t/t3100-ls-tree-restrict.sh @@ -165,4 +165,13 @@ test_expect_success \ EOF test_output' +test_expect_success \ + 'ls-tree with one path a prefix of the other' \ + 'git ls-tree $tree path2/baz path2/bazbo >current && + make_expected <<\EOF && +040000 tree X path2/baz +120000 blob X path2/bazbo +EOF + test_output' + test_done -- 2.30.2