merge: do not add standard message when message is given with -m option

Even if the user explicitly gave her own message to "git merge", the command still added its standard merge message. It resulted in a useless repetition like this: % git merge -m "Merge early part of side branch" `git rev-parse side~2` % git show -s commit 37217141e7519629353738d5e4e677a15096206f Merge: e68e646 a1d2374 Author: しらいしななこ <nanako3@lavabit.com> Date: Wed Dec 2 14:33:20 2009 +0900 Merge early part of side branch Merge commit 'a1d2374f8f52f4e8a53171601a920b538a6cec23' The gave her own message because she didn't want git to add the standard message (if she wanted to, she wouldn't have given one, or she would have prepared it using git-fmt-merge-msg command). Noticed by Nanako Shiraishi Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Dec 2, 2009 at 10:00 UTC ce9d823b9141756b5e60aa6c62653adb08e7213b

2 files changed +10 -11

builtin-merge.c

+8 -6

@@ -70,7 +70,7 @@ static int option_parse_message(const struct option *opt,

70 if (unset)

71 strbuf_setlen(buf, 0);

72 else if (arg) {

73 - strbuf_addf(buf, "%s\n\n", arg);

73 + strbuf_addf(buf, "%s%s", buf->len ? "\n\n" : "", arg);

74 have_message = 1;

75 } else

76 return error("switch `m' requires a value");

@@ -927,11 +927,13 @@ int cmd_merge(int argc, const char **argv, const char *prefix)

927 * codepath so we discard the error in this

928 * loop.

929 */

930 - for (i = 0; i < argc; i++)

931 - merge_name(argv[i], &msg);

932 - fmt_merge_msg(option_log, &msg, &merge_msg);

933 - if (merge_msg.len)

934 - strbuf_setlen(&merge_msg, merge_msg.len-1);

930 + if (!have_message) {

931 + for (i = 0; i < argc; i++)

932 + merge_name(argv[i], &msg);

933 + fmt_merge_msg(option_log, &msg, &merge_msg);

934 + if (merge_msg.len)

935 + strbuf_setlen(&merge_msg, merge_msg.len-1);

936 + }

937 }

938

939 if (head_invalid || !argc)

t/t7604-merge-custom-message.sh

+2 -5

@@ -22,15 +22,12 @@ test_expect_success 'setup' '

22 git tag c2

23 '

25 -cat >expected <<\EOF

26 -custom message

28 -Merge commit 'c2'

29 -EOF

26 test_expect_success 'merge c2 with a custom message' '

27 git reset --hard c1 &&

28 + echo >expected "custom message" &&

29 git merge -m "custom message" c2 &&

33 - git cat-file commit HEAD | sed -e "1,/^$/d" > actual &&

30 + git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&

31 test_cmp expected actual

32 '