diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-23 19:04:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-23 19:04:48 -0800 |
| commit | f630171d9d1839669446506aff0704a4dfe98b99 (patch) | |
| tree | 6fbf9fbff5cdf5b1ad1df6147090ce5f131a543c /t | |
| parent | 46cdcc627522b83bbf1d60fb3bf703b88d237dc0 (diff) | |
| parent | a324fc45e4d04e3b879cd2d9a603d73ca696b775 (diff) | |
| download | git-f630171d9d1839669446506aff0704a4dfe98b99.tar.gz | |
Merge branch 'tr/maint-no-index-fixes' into maint
* tr/maint-no-index-fixes:
diff --no-index -q: fix endless loop
diff --no-index: test for pager after option parsing
diff: accept -- when using --no-index
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4013-diff-various.sh | 1 | ||||
| -rw-r--r-- | t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index aeb5405cfe..aba53202f8 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -261,6 +261,7 @@ diff --patch-with-stat -r initial..side diff --patch-with-raw -r initial..side diff --name-status dir2 dir diff --no-index --name-status dir2 dir +diff --no-index --name-status -- dir2 dir diff master master^ side EOF diff --git a/t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir b/t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir new file mode 100644 index 0000000000..6756f8de67 --- /dev/null +++ b/t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir @@ -0,0 +1,3 @@ +$ git diff --no-index --name-status -- dir2 dir +A dir/sub +$ |