diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-26 04:52:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-26 04:52:48 (GMT) |
| commit | 28bf4ba014c9b41679f41580fa9e1cc294b240d9 (patch) | |
| tree | a6022548d912545768678c25ffbac6c57461787e /builtin-rev-parse.c | |
| parent | 4b2343fa4125f73a26cb20016a3ae3a27c00dd6f (diff) | |
| parent | ad336054068074ed614d0bb54bb169e5263499d7 (diff) | |
| download | git-28bf4ba014c9b41679f41580fa9e1cc294b240d9.zip git-28bf4ba014c9b41679f41580fa9e1cc294b240d9.tar.gz git-28bf4ba014c9b41679f41580fa9e1cc294b240d9.tar.bz2 | |
Merge branch 'maint-1.6.6' into maint-1.7.0
* maint-1.6.6:
request-pull.txt: Document -p option
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 b76f205..935fdeb 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); |