From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: jc/fix-pull-ff-only-when-already-up-to-date, was Re: What's cooking in git.git (Nov 2021, #03; Tue, 9)
Date: Wed, 10 Nov 2021 20:09:09 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2111102000250.21127@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqpmr8x6zn.fsf@gitster.g>
Hi Junio,
On Wed, 10 Nov 2021, Junio C Hamano 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.
I can say with conviction that this is a very recent change of behavior,
as I needed this quick-fix on Oct 30:
https://github.com/git-for-windows/build-extra/commit/fb311a97cf82243ea1fe4036f1b180f5a3e6bc7f
I don't recall the particular details how this fix came about, as it was
the day of -rc0 (and I don't remember whether I needed this _before_ or
_after_ Git for Windows -rc0 was released). All I remember is that an
automated build broke because it created a local commit and then expected
`git pull --ff-only` to succeed (because the remote was not ahead, but it
necessarily was behind the local HEAD).
The change of behavior might have been introduced by v2.33.1, or by
v2.34.0-rc0.
So yeah, I would argue that it is a regression introduced in this cycle.
Ciao,
Dscho
next prev parent reply other threads:[~2021-11-10 19:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-10 0:59 What's cooking in git.git (Nov 2021, #03; Tue, 9) Junio C Hamano
2021-11-10 12:47 ` js/scalar, was " Johannes Schindelin
2021-11-10 13:42 ` Ævar Arnfjörð Bjarmason
2021-11-11 18:25 ` Junio C Hamano
2021-11-12 9:32 ` Johannes Schindelin
2021-11-10 13:04 ` jc/fix-pull-ff-only-when-already-up-to-date, " Johannes Schindelin
2021-11-10 17:20 ` Junio C Hamano
2021-11-10 19:00 ` Alex Henrie
2021-11-10 19:09 ` Johannes Schindelin [this message]
2021-11-10 19:17 ` Junio C Hamano
2021-11-11 22:19 ` Emily Shaffer
2021-11-11 22:40 ` Emily Shaffer
2021-11-11 22:58 ` Junio C Hamano
2021-11-11 23:44 ` Glen Choo
2021-11-13 9:17 ` ab/config-based-hooks-2 etc. (was: What's cooking in git.git (Nov 2021, #03; Tue, 9)) Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2111102000250.21127@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).