diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2010-05-10 17:17:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-10 18:57:33 (GMT) |
| commit | 97d45bcb2f6bdd9cb164d151a6e064ffdcd5e2bc (patch) | |
| tree | a53bf4f770bdbba8888ceea4dd476af2b87ad4ef /builtin | |
| parent | 75589220289ca8400388813af66c7219811e0334 (diff) | |
| download | git-97d45bcb2f6bdd9cb164d151a6e064ffdcd5e2bc.zip git-97d45bcb2f6bdd9cb164d151a6e064ffdcd5e2bc.tar.gz git-97d45bcb2f6bdd9cb164d151a6e064ffdcd5e2bc.tar.bz2 | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 457bb5e..0ae4809 100644 --- 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 { - 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); } |