mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.6.6' into maint-1.7.0

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2010-07-25 21:52:48 -07:00
parent 4b2343fa41 ad33605406
commit 28bf4ba014
4 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-rev-parse.c
View File

@ -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);