summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-04-26 01:29:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-04-29 20:19:21 (GMT)
commit52fecab20cf28f4b5621e502a265ba551a26877e (patch)
tree4df960a94b182844d4f7f1d58577cbaa271b033f /builtin/merge.c
parent018b3fbc7e66439786492662b88cb34d7d000621 (diff)
downloadgit-52fecab20cf28f4b5621e502a265ba551a26877e.zip
git-52fecab20cf28f4b5621e502a265ba551a26877e.tar.gz
git-52fecab20cf28f4b5621e502a265ba551a26877e.tar.bz2
merge: extract prepare_merge_message() logic out
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c26
1 files changed, 15 insertions, 11 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index d853c9d..a972ed6 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1076,6 +1076,20 @@ static struct commit_list *reduce_parents(struct commit *head_commit,
return remoteheads;
}
+static void prepare_merge_message(struct strbuf *merge_names, struct strbuf *merge_msg)
+{
+ struct fmt_merge_msg_opts opts;
+
+ memset(&opts, 0, sizeof(opts));
+ opts.add_title = !have_message;
+ opts.shortlog_len = shortlog_len;
+ opts.credit_people = (0 < option_edit);
+
+ fmt_merge_msg(merge_names, merge_msg, &opts);
+ if (merge_msg->len)
+ strbuf_setlen(merge_msg, merge_msg->len - 1);
+}
+
static struct commit_list *collect_parents(struct commit *head_commit,
int *head_subsumed,
int argc, const char **argv)
@@ -1248,20 +1262,10 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if (!have_message || shortlog_len) {
struct strbuf merge_names = STRBUF_INIT;
- struct fmt_merge_msg_opts opts;
for (p = remoteheads; p; p = p->next)
merge_name(merge_remote_util(p->item)->name, &merge_names);
-
- memset(&opts, 0, sizeof(opts));
- opts.add_title = !have_message;
- opts.shortlog_len = shortlog_len;
- opts.credit_people = (0 < option_edit);
-
- fmt_merge_msg(&merge_names, &merge_msg, &opts);
- if (merge_msg.len)
- strbuf_setlen(&merge_msg, merge_msg.len - 1);
-
+ prepare_merge_message(&merge_names, &merge_msg);
strbuf_release(&merge_names);
}
}