aboutsummaryrefslogtreecommitdiff
path: root/t/t4013-diff-various.sh
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2009-01-06 19:53:32 +0100
committerJunio C Hamano <gitster@pobox.com>2009-01-06 23:18:20 -0800
commite423ffd8a6f46a14ecbb637d909290bd3579cebd (patch)
treedcb6814de273d92e9577b1ee6e459657b468e7b0 /t/t4013-diff-various.sh
parenta567fdcb016e8e882ec0a1e044c9caac8f70e693 (diff)
downloadgit-e423ffd8a6f46a14ecbb637d909290bd3579cebd.tar.gz
git-e423ffd8a6f46a14ecbb637d909290bd3579cebd.tar.xz
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-xt/t4013-diff-various.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index aeb5405cf..aba53202f 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