kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge: decide if we auto-generate the message early in collect_parents() 

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2015-04-25 18:39:43 -07:00
parent 1cf32f4d54
commit 770380156d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/merge.c
View File

@ -1098,6 +1098,10 @@ static struct commit_list *collect_parents(struct commit *head_commit,
int i;
struct commit_list *remoteheads = NULL;
struct commit_list **remotes = &remoteheads;
struct strbuf merge_names = STRBUF_INIT, *autogen = NULL;

if (merge_msg && (!have_message || shortlog_len))
autogen = &merge_names;

if (head_commit)
remotes = &commit_list_insert(head_commit, remotes)->next;
@ -1111,15 +1115,13 @@ static struct commit_list *collect_parents(struct commit *head_commit,

remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads);

if (merge_msg &&
(!have_message || shortlog_len)) {
struct strbuf merge_names = STRBUF_INIT;
if (autogen) {
struct commit_list *p;

for (p = remoteheads; p; p = p->next)
merge_name(merge_remote_util(p->item)->name, &merge_names);
prepare_merge_message(&merge_names, merge_msg);
strbuf_release(&merge_names);
merge_name(merge_remote_util(p->item)->name, autogen);

prepare_merge_message(autogen, merge_msg);
strbuf_release(autogen);
}

return remoteheads;