diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-07-06 16:46:05 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-07-07 11:11:50 -0700 |
commit | 29981380d03ffa63765dbeaea53a7ac9e8d6bc4f (patch) | |
tree | 65276369bfba95010c9d53778c1b9772834f0ba6 /t/t7602-merge-octopus-many.sh | |
parent | Merge branch 'maint-1.6.3' into maint-1.6.4 (diff) | |
download | tgif-29981380d03ffa63765dbeaea53a7ac9e8d6bc4f.tar.xz |
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/t7602-merge-octopus-many.sh')
0 files changed, 0 insertions, 0 deletions