Re: Merge commit subjects git.git

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Jul 18, 2010, 16:18 UTC
Message-ID: <AANLkTikhhjjRYPY4KWEJWUQjCw4TzhXRMvHRsaQ7BECe@mail.gmail.com>
In-Reply-To: <201007181733.59704.trast@student.ethz.ch>

On Sun, Jul 18, 2010 at 15:33, Thomas Rast <trast@student.ethz.ch> wrote:

Show 7 quoted lines

> 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))

Is there anything in Git that records what the canonical branch is? E.g. perl uses "blead", and gets these "into blead" merge commits every time it merges into the main branch.

The HEAD can move, so that can't be checked.

(not that this is an actual problem)

>                strbuf_addch(out, '\n');
>        else
>                strbuf_addf(out, " into %s\n", current_branch);
> }