aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-17 11:21:34 -0800
committerJunio C Hamano <gitster@pobox.com>2013-12-17 11:21:34 -0800
commitc8b928d7700b581118a7a1beb957184fcbe57d06 (patch)
treedeef37f7c08ddbe4b3424f499dd60785940805a9 /t
parent3e7b066e2229f45d633164beaeb8815b0973a9b4 (diff)
parent887c6c18ba84da8d722b1528fe8cdde65d9f9860 (diff)
downloadgit-c8b928d7700b581118a7a1beb957184fcbe57d06.tar.gz
git-c8b928d7700b581118a7a1beb957184fcbe57d06.tar.xz
Merge branch 'nd/magic-pathspec' into maint
"git diff -- ':(icase)makefile'" was unnecessarily rejected at the command line parser. * nd/magic-pathspec: diff: restrict pathspec limitations to diff b/f case only
Diffstat (limited to 't')
-rwxr-xr-xt/t6131-pathspec-icase.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t6131-pathspec-icase.sh b/t/t6131-pathspec-icase.sh
index 8d4a7fcb9..a7c7ff5f4 100755
--- a/t/t6131-pathspec-icase.sh
+++ b/t/t6131-pathspec-icase.sh
@@ -100,4 +100,10 @@ test_expect_success 'match_pathspec_depth matches :(icase)bar with empty prefix'
test_cmp expect actual
'
+test_expect_success '"git diff" can take magic :(icase) pathspec' '
+ echo FOO/BAR >expect &&
+ git diff --name-only HEAD^ HEAD -- ":(icase)foo/bar" >actual &&
+ test_cmp expect actual
+'
+
test_done