mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
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>
This commit is contained in:
parent
7558922028
commit
97d45bcb2f
|
@ -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";
|
||||
|
@ -988,8 +988,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
|
|||
*/
|
||||
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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue