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>
Tay Ray Chuan committed
May 11, 2010 at 01:17 UTC
97d45bcb2f6bdd9cb164d151a6e064ffdcd5e2bc
1 file changed
+3
-3
builtin/merge.c
+3
-3
@@ -973,7 +973,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
973
reset_hard(remote_head->sha1, 0);
974
return 0;
975
} else {
976
- struct strbuf msg = STRBUF_INIT;
976
+ struct strbuf merge_names = STRBUF_INIT;
977
978
/* We are invoked directly as the first-class UI. */
979
head_arg = "HEAD";
@@ -988,8 +988,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
988
*/
989
if (!have_message) {
990
for (i = 0; i < argc; i++)
991
- merge_name(argv[i], &msg);
992
- fmt_merge_msg(option_log, &msg, &merge_msg);
991
+ merge_name(argv[i], &merge_names);
992
+ fmt_merge_msg(option_log, &merge_names, &merge_msg);
993
if (merge_msg.len)
994
strbuf_setlen(&merge_msg, merge_msg.len-1);
995
}