Re: Merge commit subjects git.git

From: Thomas Rast <trast@student.ethz.ch>
Date: Jul 18, 2010, 15:33 UTC
Message-ID: <201007181733.59704.trast@student.ethz.ch>
In-Reply-To: <AANLkTikavL0DH8FgFxBw7hbGLtj2tqxnP-BT77zo5FJT@mail.gmail.com>

Jay Soffian wrote:

Show 11 quoted lines

> Color me curious, but why do the merge commit message in git.git
> sometimes look like this:
> 
>   Merge branch 'jn/paginate-fix'
> 
> And other times like this:
> 
>   Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix
> 
> I don't really see any rhyme or reason about when the "into ..." is
> there and when it's not.

A merge that does not have the 'into <branch>' bit is a merge to master:

static void do_fmt_merge_msg_title(struct strbuf *out,
	const char *current_branch) {
[...]
	if (!strcmp("master", current_branch))
		strbuf_addch(out, '\n');
	else
		strbuf_addf(out, " into %s\n", current_branch);
}

-- 
Thomas Rast
trast@{inf,student}.ethz.ch