diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-07-06 14:46:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-07 18:11:50 (GMT) |
| commit | 29981380d03ffa63765dbeaea53a7ac9e8d6bc4f (patch) | |
| tree | 65276369bfba95010c9d53778c1b9772834f0ba6 /t/t1502-rev-parse-parseopt.sh | |
| parent | 814035c12a07927ea03350184a14f869cdce7276 (diff) | |
| download | git-29981380d03ffa63765dbeaea53a7ac9e8d6bc4f.zip git-29981380d03ffa63765dbeaea53a7ac9e8d6bc4f.tar.gz git-29981380d03ffa63765dbeaea53a7ac9e8d6bc4f.tar.bz2 | |
rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
The ?: operator has a lower priority than |, so the implicit associativity
made the 6th argument of parse_options be PARSE_OPT_KEEP_DASHDASH if
keep_dashdash was true discarding PARSE_OPT_STOP_AT_NON_OPTION and
PARSE_OPT_SHELL_EVAL.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1502-rev-parse-parseopt.sh')
| -rwxr-xr-x | t/t1502-rev-parse-parseopt.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh index e504058..3b612c6 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 |