aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-25 21:51:58 -0700
committerJunio C Hamano <gitster@pobox.com>2010-07-25 21:51:58 -0700
commita07b10c8f930e88386d3b7424f25190af554275e (patch)
treecbacdd069189db730084b08cc05c8a041ce64934 /t
parent8024d5961bf885245d8febcb189a8c71bb46b29f (diff)
parent1b0b962d771fb734cbf273f216b487bb58dec7b9 (diff)
downloadgit-a07b10c8f930e88386d3b7424f25190af554275e.tar.gz
git-a07b10c8f930e88386d3b7424f25190af554275e.tar.xz
Merge branch 'maint-1.6.4' into maint-1.6.5
* maint-1.6.4: 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 e50405806..3b612c67b 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