summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-07-07 11:13:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-07 11:13:40 -0700
commit878bd809d7c879f1a9ea00bdb4cb97d846ef4e93 (patch)
treea7187cf9eef1b4bcdf71cd53fb74d0e4428ca3e2 /t
parentMerge branch 'mg/doc-rev-parse-treepath-syntax' into maint (diff)
parentrev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option (diff)
downloadtgif-878bd809d7c879f1a9ea00bdb4cb97d846ef4e93.tar.xz
Merge branch 'maint-1.6.4' into maint
* maint-1.6.4: rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
Diffstat (limited to 't')
-rwxr-xr-xt/t1502-rev-parse-parseopt.sh18
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index e504058062..3b612c67be 100755
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -79,4 +79,22 @@ test_expect_success 'test --parseopt --keep-dashdash' '
test_cmp expect output
'
+cat >expect <<EOF
+set -- --foo -- '--' 'arg' '--spam=ham'
+EOF
+
+test_expect_success 'test --parseopt --keep-dashdash --stop-at-non-option with --' '
+ git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo -- arg --spam=ham <optionspec >output &&
+ test_cmp expect output
+'
+
+cat > expect <<EOF
+set -- --foo -- 'arg' '--spam=ham'
+EOF
+
+test_expect_success 'test --parseopt --keep-dashdash --stop-at-non-option without --' '
+ git rev-parse --parseopt --keep-dashdash --stop-at-non-option -- --foo arg --spam=ham <optionspec >output &&
+ test_cmp expect output
+'
+
test_done