From: Tay Ray Chuan Date: Mon, 10 May 2010 17:17:48 GMT Subject: [PATCH 4/8] merge: rename variable Message-ID: <1273511872-4924-5-git-send-email-rctay89@gmail.com> In-Reply-To: <1273511872-4924-1-git-send-email-rctay89@gmail.com> 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 --- builtin/merge.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index c2691e8..bc7e5e7 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -982,7 +982,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"; @@ -997,8 +997,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); } -- 1.7.1.189.g07419