Re: [PATCH 2/2] pull: improve default warning

From: Alex Henrie <alexhenrie24@gmail.com>
Date: Jun 24, 2021, 03:38 UTC
Message-ID: <CAMMLpeTQjw0W8ZTegPru_9muRBGj7RDfk3WgEEN34vm-PG9Jfg@mail.gmail.com>
In-Reply-To: <60d37b3b77aeb_378720834@natae.notmuch>

On Tue, Jun 22, 2021 at 8:20 PM Elijah Newren <newren@gmail.com> wrote:

Show 12 quoted lines

>
> On Tue, Jun 22, 2021 at 2:22 PM Alex Henrie <alexhenrie24@gmail.com> wrote:
> >
> > While
> > we're on the subject, do you have any thoughts on what (if anything)
> > more should be done before making the switch to aborting instead of
> > merging with a warning in `git pull`?
>
> I think Junio already answered that over here:
> https://lore.kernel.org/git/xmqq360h8286.fsf@gitster.c.googlers.com/
> (he discussed it multiple times in that thread, but hopefully that's a
> good enough example).

Wow, if I understand correctly from that message, Junio wouldn't mind making the switch right away. That's very encouraging.

On Wed, Jun 23, 2021 at 12:19 PM Felipe Contreras <felipe.contreras@gmail.com> wrote:

>
> Similarly, until "git pull" does something sensible by default (which
> isn't the case now), these debates will continue, and there's value in
> them.

At this point, I'm inclined to push for s/advise/die/ in pull.c in the next release, without a transitional period, just to end the argument over how to best explain the current awkward situation. (I'm sure there will be more arguments after that, but hopefully they won't be as tiresome.)

-Alex