Merge branch 'tc/commit-abbrev-fix' into maint

diff --git a/builtin/merge.c b/builtin/merge.c
index 457bb5e48addabe3f2537266b4515add3f89a9b3..cae1cbee26535635cfe0d7e3a6f98e3a36e94cf7 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -973,7 +973,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                reset_hard(remote_head->sha1, 0);
                return 0;
        } else {
-               struct strbuf msg = STRBUF_INIT;
+               struct strbuf merge_names = STRBUF_INIT;
 
                /* We are invoked directly as the first-class UI. */
                head_arg = "HEAD";
@@ -981,18 +981,22 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                /*
                 * All the rest are the commits being merged;
                 * prepare the standard merge summary message to
-                * used as the merge message.  If remote
+                * be appended to the given message.  If remote
                 * is invalid we will die later in the common
                 * codepath so we discard the error in this
                 * loop.
                 */
-               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);
-               }
+               for (i = 0; i < argc; i++)
+                       merge_name(argv[i], &merge_names);
+
+               if (have_message && option_log)
+                       fmt_merge_msg_shortlog(&merge_names, &merge_msg);
+               else if (!have_message)
+                       fmt_merge_msg(option_log, &merge_names, &merge_msg);
+
+
+               if (!(have_message && !option_log) && merge_msg.len)
+                       strbuf_setlen(&merge_msg, merge_msg.len-1);
        }
 
        if (head_invalid || !argc)