diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-25 21:51:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-25 21:51:58 -0700 |
| commit | a07b10c8f930e88386d3b7424f25190af554275e (patch) | |
| tree | cbacdd069189db730084b08cc05c8a041ce64934 /builtin-rev-parse.c | |
| parent | Remove extra '-' from git-am(1) (diff) | |
| parent | Check size of path buffer before writing into it (diff) | |
| download | git-a07b10c8f930e88386d3b7424f25190af554275e.tar.gz git-a07b10c8f930e88386d3b7424f25190af554275e.zip | |
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 '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 45bead6545..b58531209e 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); |