diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-18 10:05:38 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-18 10:05:38 +0300 |
commit | 33256e6b1bfb597f6505a7f40554097035c9ab60 (patch) | |
tree | c11c1e63052e9a6e16c3487a48b811e1b9d89ed9 /t | |
parent | 5786f4fac7afa881a306e2b771a0307e4ee05384 (diff) | |
parent | a324fc45e4d04e3b879cd2d9a603d73ca696b775 (diff) |
Merge branch 'tr/maint-no-index-fixes'
* 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 +$ |