diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-26 04:52:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-26 04:52:29 (GMT) |
| commit | ad336054068074ed614d0bb54bb169e5263499d7 (patch) | |
| tree | fc027032ffafab2e5ad113bf42766f51cd4ebe5b /builtin-rev-parse.c | |
| parent | b75686455c0524f167b6a878c124df40db34b325 (diff) | |
| parent | d8e3ac7e7264863544c95069024f1cbaedb5db3d (diff) | |
| download | git-ad336054068074ed614d0bb54bb169e5263499d7.zip git-ad336054068074ed614d0bb54bb169e5263499d7.tar.gz git-ad336054068074ed614d0bb54bb169e5263499d7.tar.bz2 | |
Merge branch 'maint-1.6.5' into maint-1.6.6
* maint-1.6.5:
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 37d0233..ee00125 100644 --- a/builtin-rev-parse.c +++ b/builtin-rev-parse.c @@ -403,8 +403,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); |