summaryrefslogtreecommitdiff
path: root/builtin/rev-parse.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-07 18:13:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-07 18:13:40 (GMT)
commit878bd809d7c879f1a9ea00bdb4cb97d846ef4e93 (patch)
treea7187cf9eef1b4bcdf71cd53fb74d0e4428ca3e2 /builtin/rev-parse.c
parent8e99859266fa2f565d951a0a2ed8aed4b6e2ae8a (diff)
parent29981380d03ffa63765dbeaea53a7ac9e8d6bc4f (diff)
downloadgit-878bd809d7c879f1a9ea00bdb4cb97d846ef4e93.zip
git-878bd809d7c879f1a9ea00bdb4cb97d846ef4e93.tar.gz
git-878bd809d7c879f1a9ea00bdb4cb97d846ef4e93.tar.bz2
Merge branch 'maint-1.6.4' into maint
* maint-1.6.4: rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
Diffstat (limited to 'builtin/rev-parse.c')
-rw-r--r--builtin/rev-parse.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 8fbf9d0..95c59fa 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -407,8 +407,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);