merge: rename variable

It is more accurate to call it 'merge_names' instead of 'msg', as it
does not contain the final message.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/merge.c b/builtin/merge.c
index 457bb5e48addabe3f2537266b4515add3f89a9b3..0ae480987ac4d97af437e27a9e4d6b8e4ecf4211 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 {
                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";
 
                /* We are invoked directly as the first-class UI. */
                head_arg = "HEAD";


@@ -988,8 +988,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                 */
                if (!have_message) {
                        for (i = 0; i < argc; i++)
                 */
                if (!have_message) {
                        for (i = 0; i < argc; i++)

-                               merge_name(argv[i], &msg);
-                       fmt_merge_msg(option_log, &msg, &merge_msg);
+                               merge_name(argv[i], &merge_names);
+                       fmt_merge_msg(option_log, &merge_names, &merge_msg);

                        if (merge_msg.len)
                                strbuf_setlen(&merge_msg, merge_msg.len-1);
                }
                        if (merge_msg.len)
                                strbuf_setlen(&merge_msg, merge_msg.len-1);
                }