diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-02 10:30:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-02 10:30:12 -0800 |
| commit | 0748494e866041034605aaf177f29a61bdc25951 (patch) | |
| tree | e48f6c091a7231ae0db5d643215df16c5bd7a8d9 /builtin-merge.c | |
| parent | c86485dd15d54fc6ff2cd0dda3b2a9faa4f2d66e (diff) | |
| parent | 28044baba6d268d91057398ffa041ee1b931a5e0 (diff) | |
| download | git-0748494e866041034605aaf177f29a61bdc25951.tar.gz git-0748494e866041034605aaf177f29a61bdc25951.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for 1.6.5.4
merge: do not add standard message when message is given with -m option
Do not misidentify "git merge foo HEAD" as an old-style invocation
Conflicts:
RelNotes
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 21045776b..56a1bb651 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -71,7 +71,7 @@ static int option_parse_message(const struct option *opt, if (unset) strbuf_setlen(buf, 0); else if (arg) { - strbuf_addf(buf, "%s\n\n", arg); + strbuf_addf(buf, "%s%s", buf->len ? "\n\n" : "", arg); have_message = 1; } else return error("switch `m' requires a value"); @@ -804,7 +804,7 @@ static const char deprecation_warning[] = static struct commit *is_old_style_invocation(int argc, const char **argv) { struct commit *second_token = NULL; - if (argc > 1) { + if (argc > 2) { unsigned char second_sha1[20]; if (get_sha1(argv[1], second_sha1)) @@ -943,11 +943,13 @@ int cmd_merge(int argc, const char **argv, const char *prefix) * codepath so we discard the error in this * loop. */ - for (i = 0; i < argc; i++) - merge_name(argv[i], &msg); - fmt_merge_msg(option_log, &msg, &merge_msg); - if (merge_msg.len) - strbuf_setlen(&merge_msg, merge_msg.len-1); + if (!have_message) { + for (i = 0; i < argc; i++) + merge_name(argv[i], &msg); + fmt_merge_msg(option_log, &msg, &merge_msg); + if (merge_msg.len) + strbuf_setlen(&merge_msg, merge_msg.len-1); + } } if (head_invalid || !argc) |