Re: [PATCH 1/1] merge-recursive: give notice when submodule commit gets fast-forwarded

From: Elijah Newren <newren@gmail.com>
Date: Jun 7, 2018, 05:22 UTC
Message-ID: <CABPp-BEdaSVG9GGwxLwr=neWGq-vO39njC+Ri4tDmN5PPtAntg@mail.gmail.com>
In-Reply-To: <20180604184805.36332-2-leif.middelschulte@gmail.com>

Hi Leif,

On Mon, Jun 4, 2018 at 11:48 AM, Leif Middelschulte <leif.middelschulte@gmail.com> wrote:

Show 5 quoted lines

> From: Leif Middelschulte <Leif.Middelschulte@gmail.com>
>
> Since submodules are treated similarly to ordinary files (i.e. not as 'dumb'
> pointers), an automatic merge should be mentioned if the user asks for it.
> Just as it is mentioned for oridnary files.

Thanks for following up; sorry it took me a few days to respond. However, it looks like Junio merged the sb/submodule-merge-in-merge-recursive topic, including your patch, to master back on May 30. As such, instead of re-rolling your patch, we'd need a patch on top of the other existing change.

Also, take a look at the preliminary release announcement -- you show
up as a new contributor to git!  See it at
  https://public-inbox.org/git/xmqqwove4pzo.fsf@gitster-ct.c.googlers.com/

> +                       output(o, 2, _("Auto-merging %s"), path);

...

> +                       output(o, 2, _("Auto-merging %s"), path);

I preferred your old initial wording here, "Fast-forwarding submodule %s" (I just wanted the "to %s" part at the end removed). I'm afraid that users who saw "Auto-merging $submodule" would assume that we descended into the submodule and ran a full merge there.

Could you submit a patch that just removed that "to %s" part?