diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2009-01-06 18:53:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-07 07:18:20 (GMT) |
| commit | e423ffd8a6f46a14ecbb637d909290bd3579cebd (patch) | |
| tree | dcb6814de273d92e9577b1ee6e459657b468e7b0 /t/t4013-diff-various.sh | |
| parent | a567fdcb016e8e882ec0a1e044c9caac8f70e693 (diff) | |
| download | git-e423ffd8a6f46a14ecbb637d909290bd3579cebd.zip git-e423ffd8a6f46a14ecbb637d909290bd3579cebd.tar.gz git-e423ffd8a6f46a14ecbb637d909290bd3579cebd.tar.bz2 | |
diff: accept -- when using --no-index
Accept -- as an "end of options" marker even when using --no-index.
Previously, the -- triggered a "normal" index/tree diff and subsequently
failed because of the unrecognized (in that mode) --no-index.
Note that the second loop can treat '--' as a normal option, because
the preceding checks ensure it is the third-to-last argument.
While at it, fix the parsing of "-q" option in --no-index mode as well.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index aeb5405..aba5320 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 |