diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-17 19:21:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-17 19:21:34 (GMT) |
| commit | c8b928d7700b581118a7a1beb957184fcbe57d06 (patch) | |
| tree | deef37f7c08ddbe4b3424f499dd60785940805a9 /t | |
| parent | 3e7b066e2229f45d633164beaeb8815b0973a9b4 (diff) | |
| parent | 887c6c18ba84da8d722b1528fe8cdde65d9f9860 (diff) | |
| download | git-c8b928d7700b581118a7a1beb957184fcbe57d06.zip git-c8b928d7700b581118a7a1beb957184fcbe57d06.tar.gz git-c8b928d7700b581118a7a1beb957184fcbe57d06.tar.bz2 | |
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-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 8d4a7fc..a7c7ff5 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 |