summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-07-25 21:52:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-25 21:52:29 -0700
commitad336054068074ed614d0bb54bb169e5263499d7 (patch)
treefc027032ffafab2e5ad113bf42766f51cd4ebe5b /t
parentMSVC: Fix build by adding missing termios.h dummy (diff)
parentrequest-pull.txt: Document -p option (diff)
downloadtgif-ad336054068074ed614d0bb54bb169e5263499d7.tar.xz
Merge branch 'maint-1.6.5' into maint-1.6.6
* maint-1.6.5: request-pull.txt: Document -p option Check size of path buffer before writing into it 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