Re: jc/fix-pull-ff-only-when-already-up-to-date, was Re: What's cooking in git.git (Nov 2021, #03; Tue, 9)

[Alex Henrie <alexhenrie24@gmail.com>]

On Wed, Nov 10, 2021 at 10:21 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > On Tue, 9 Nov 2021, Junio C Hamano wrote:
> >
> >> * jc/fix-pull-ff-only-when-already-up-to-date (2021-10-29) 1 commit
> >>   (merged to 'next' on 2021-10-29 at ad4753e668)
> >>  + pull: --ff-only should make it a noop when already-up-to-date
> >>
> >>  "git pull --ff-only" and "git pull --rebase --ff-only" should make
> >>  it a no-op to attempt pulling from a remote that is behind us, but
> >>  instead the command errored out by saying it was impossible to
> >>  fast-forward, which may technically be true, but not a useful thing
> >>  to diagnose as an error.  This has been corrected.
> >>
> >>  Will cook in 'next'.
> >
> > I would like to register a vote for advancing this into v2.34.0,
> > still.
>
> I didn't recall I did it as a regression fix, but as a fix for
> relatively old change that is already in released version(s) in the
> field.  If the breakage is new between 2.33.0 and 'master', I think
> it is a good idea to merge it down.

For what it's worth, I also consider this to be a (small) regression
introduced in 2.33.0. So I'd also like to vote for fixing it in 2.34.

-Alex