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 /builtin-rev-parse.c | |
| 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 'builtin-rev-parse.c')
| -rw-r--r-- | builtin-rev-parse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c index 45bead6..b585312 100644 --- a/builtin-rev-parse.c +++ b/builtin-rev-parse.c @@ -397,8 +397,8 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix) ALLOC_GROW(opts, onb + 1, osz); memset(opts + onb, 0, sizeof(opts[onb])); argc = parse_options(argc, argv, prefix, opts, usage, - keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0 | - stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0); + (keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0) | + (stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0)); strbuf_addf(&parsed, " --"); sq_quote_argv(&parsed, argv, 0); |