summaryrefslogtreecommitdiff
path: root/t/t3100-ls-tree-restrict.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-11 11:47:09 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-12 13:52:03 -0700
commitb294ed637d3c13cd96ba6f0e464e02e170cc54a6 (patch)
treef5606a75fdfbfb5c1cdf35def8ccc2ff7ae103ff /t/t3100-ls-tree-restrict.sh
parent9904fadfea002edf2ef22e8ec9a978e45d1f540b (diff)
downloadgit-b294ed637d3c13cd96ba6f0e464e02e170cc54a6.tar.gz
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 't/t3100-ls-tree-restrict.sh')
-rwxr-xr-xt/t3100-ls-tree-restrict.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh
index eee0d344d2..81d90b66c5 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