aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-18 15:16:43 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-18 15:16:43 -0800
commitc74f97a624f6a79767d2e2d55d98bab5e2b02f16 (patch)
tree4a28f82f00c00afba38a89c51452652ffc9a5a7d /t
parent8ef7933880e6134f51d7bb5d7566b31ca93ee8c7 (diff)
parent4838237cb73a13d38a7e4348b71be96b60eed21e (diff)
downloadgit-c74f97a624f6a79767d2e2d55d98bab5e2b02f16.tar.gz
git-c74f97a624f6a79767d2e2d55d98bab5e2b02f16.tar.xz
Merge branch 'nd/pathspec-recursion-cleanup'
* nd/pathspec-recursion-cleanup: diff-index: enable recursive pathspec matching in unpack_trees Document limited recursion pathspec matching with wildcards
Diffstat (limited to 't')
-rwxr-xr-xt/t4010-diff-pathspec.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index fbc8cd8f0..af5134b70 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -48,6 +48,14 @@ test_expect_success \
compare_diff_raw current expected'
cat >expected <<\EOF
+:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1
+EOF
+test_expect_success \
+ '"*file1" should show path1/file1' \
+ 'git diff-index --cached $tree -- "*file1" >current &&
+ compare_diff_raw current expected'
+
+cat >expected <<\EOF
:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M file0
EOF
test_expect_success \