diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-07 22:18:26 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-07 22:18:26 +0400 |
| commit | fcd91f8de20bf7969599a7a60cba73117d99f2d1 (patch) | |
| tree | 41fe45b3c1cd2ef3f1b84cc1fdeff14468cd6997 /builtin | |
| parent | 0cc4da303641611e8d9cc431e7b4d3f1a6a0dc86 (diff) | |
| parent | c30e742c4981585061ed52c14abd9ebd32a0e18b (diff) | |
Merge branch 'maint'
* maint:
backmerge a few more fixes to 1.7.1.X series
rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
fix git branch -m in presence of cross devices
Conflicts:
RelNotes
builtin/rev-parse.c
Diffstat (limited to 'builtin')
| -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 b676e29635..a5a1c86e92 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) | PARSE_OPT_SHELL_EVAL); strbuf_addf(&parsed, " --"); |