diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-12-06 11:08:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-06 11:09:41 -0800 |
| commit | e2bcd4f77968e075c2987da020ba7a843007a54f (patch) | |
| tree | 05619481a0da9f803f4010f1077aae7e3be37bb9 /t | |
| parent | Merge branch 'rr/for-each-ref-decoration' (diff) | |
| parent | diff: restrict pathspec limitations to diff b/f case only (diff) | |
| download | tgif-e2bcd4f77968e075c2987da020ba7a843007a54f.tar.xz | |
Merge branch 'nd/magic-pathspec'
"git diff -- ':(icase)makefile'" were rejected unnecessarily.
This needs to be merged to 'maint' later.
* nd/magic-pathspec:
diff: restrict pathspec limitations to diff b/f case only
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6131-pathspec-icase.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t6131-pathspec-icase.sh b/t/t6131-pathspec-icase.sh index 8d4a7fcb91..a7c7ff5f49 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 |