From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 11 Sep 2010 18:47:09 +0000 (-0700)
Subject: ls-tree $di $dir: do not mistakenly recurse into directories
X-Git-Tag: v1.7.3-rc2~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b294ed637d3c13cd96ba6f0e464e02e170cc54a6;p=git.git

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>
---

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