undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge: rename variable

Browse Source 
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>
This commit is contained in:
Tay Ray Chuan 2010-05-11 01:17:48 +08:00 committed by Junio C Hamano
parent 7558922028
commit 97d45bcb2f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/merge.c
View File

@ -973,7 +973,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
reset_hard(remote_head->sha1, 0); reset_hard(remote_head->sha1, 0);
return 0; return 0;
} else { } else {
struct strbuf msg = STRBUF_INIT; struct strbuf merge_names = STRBUF_INIT;
/* We are invoked directly as the first-class UI. */ /* We are invoked directly as the first-class UI. */
head_arg = "HEAD"; head_arg = "HEAD";
@ -988,8 +988,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
*/ */
if (!have_message) { if (!have_message) {
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
merge_name(argv[i], &msg); merge_name(argv[i], &merge_names);
fmt_merge_msg(option_log, &msg, &merge_msg); fmt_merge_msg(option_log, &merge_names, &merge_msg);
if (merge_msg.len) if (merge_msg.len)
strbuf_setlen(&merge_msg, merge_msg.len-1); strbuf_setlen(&merge_msg, merge_msg.len-1);
} }