Re: [PATCH v2] pull: warn if the user didn't say whether to rebase or to merge

From: Alex Henrie <alexhenrie24@gmail.com>
Date: Feb 29, 2020, 21:21 UTC
Message-ID: <CAMMLpeSSET8F+BTooDhBTBGkh2JjvLWOPwA-ibspoDO0NqGy7A@mail.gmail.com>
In-Reply-To: <xmqqzhd1balh.fsf@gitster-ct.c.googlers.com>

On Sat, Feb 29, 2020 at 9:51 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 20 quoted lines

>
> Alex Henrie <alexhenrie24@gmail.com> writes:
>
> > +             warning(_("Pulling without specifying whether to rebase or to merge is discouraged\n"
> > +                     "and will be disallowed in a future Git release.\n"
>
> Sorry for not catching this in the earlier round, but I do not think
> anybody argued, let alone the community came to a concensus on
> doing, such a strong move.  Am I mistaken?
>
> I certainly did not intend to, at least when I commented on the
> earlier round and proposed an updated log message, I wasn't even
> aware of the possibility that we may want to turn this into die()
> after a transition period.
>
> Not that I'd object strongly to the idea, but it was somewhat
> unexpected.
>
> If we are proposing to make it a long-term plan, that should
> certainly be written down in the proposed log message.

I really don't think it's a good idea to start making a merge commit without confirming that that's what the user wants. Elijah and Robert seemed to agree. However, we can start by just putting in a friendly educational message and then continue the discussion about whether or not to make a future version of Git abort upon printing the warning.

Show 12 quoted lines

> > +                     "Next time, run `git config pull.rebase (true|false)` first\n"
> > +                     "or pass --rebase, --no-rebase, or --ff-only on the command line.\n
>
> I am somewhat puzzled by "first, or".  You certainly mean the config
> to be "set and forget", and you do not want to say "before you pull,
> do this first, always", but somehow the latter is the impression I
> got.
>
> But it does not sound to me like "Next time, and only next time, do
> this configuration.  You can countermand the choice you make from
> the command line later if needed", which I think is what you meant
> to convey to your readers.

I'll send a new version that has a longer and more clear warning message.

-Alex