From: Alex Henrie <alexhenrie24@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Git mailing list <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 12:00:20 -0700 [thread overview]
Message-ID: <CAMMLpeS3Lerps8ioO7Ap=Cs29dDssp5F-KgvENkN5qDg+tZXxQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqpmr8x6zn.fsf@gitster.g>
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
next prev parent reply other threads:[~2021-11-10 19:05 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 [this message]
2021-11-10 19:09 ` Johannes Schindelin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMMLpeS3Lerps8ioO7Ap=Cs29dDssp5F-KgvENkN5qDg+tZXxQ@mail.gmail.com' \
--to=alexhenrie24@gmail.com \
--cc=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.
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 NNTP newsgroup(s).