Re: [PATCH v2] pull: --ff-only should make it a noop when already-up-to-date

From: Alex Henrie <alexhenrie24@gmail.com>
Date: Oct 21, 2021, 06:38 UTC
Message-ID: <CAMMLpeQYSWyhM92RDQuK0TSkNcbuE06_8RQiYHtz_JDYmXJXMA@mail.gmail.com>
In-Reply-To: <YXB/1S2fid7MUmvu@coredump.intra.peff.net>

On Wed, Oct 20, 2021 at 2:45 PM Jeff King <peff@peff.net> wrote:

Show 18 quoted lines

>
> On Wed, Oct 20, 2021 at 12:02:09PM -0700, Junio C Hamano wrote:
>
> > Earlier, we made sure that "git pull --ff-only" (and "git -c
> > pull.ff=only pull") errors out when our current HEAD is not an
> > ancestor of the tip of the history we are merging, but the condition
> > to trigger the error was implemented incorrectly.
> >
> > Imagine you forked from a remote branch, built your history on top
> > of it, and then attempted to pull from them again.  If they have not
> > made any update in the meantime, our current HEAD is obviously not
> > their ancestor, and this new error triggers.
> >
> > Without the --ff-only option, we just report that there is no need
> > to pull; we did the same historically with --ff-only, too.
>
> Thanks, this looks good to me overall, and I agree this is a regression
> we should try to fix promptly (so thank you for jumping on it).

It looks like you guys got this under control in no time. Thank you so much!

-Alex