From: Alex Henrie <alexhenrie24@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Git mailing list <git@vger.kernel.org>,
Kenneth Arnold <ka37@calvin.edu>
Subject: Re: [PATCH v2] pull: --ff-only should make it a noop when already-up-to-date
Date: Thu, 21 Oct 2021 00:38:23 -0600 [thread overview]
Message-ID: <CAMMLpeQYSWyhM92RDQuK0TSkNcbuE06_8RQiYHtz_JDYmXJXMA@mail.gmail.com> (raw)
In-Reply-To: <YXB/1S2fid7MUmvu@coredump.intra.peff.net>
On Wed, Oct 20, 2021 at 2:45 PM Jeff King <peff@peff.net> wrote:
>
> 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
prev parent reply other threads:[~2021-10-21 6:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-19 17:23 "Not possible to fast-forward" when pull.ff=only and new commits on remote Kenneth Arnold
2021-10-19 21:22 ` Jeff King
2021-10-20 16:28 ` Junio C Hamano
2021-10-20 17:09 ` Jeff King
2021-10-20 19:19 ` Junio C Hamano
2021-10-20 20:36 ` Jeff King
2021-10-20 19:02 ` [PATCH v2] pull: --ff-only should make it a noop when already-up-to-date Junio C Hamano
2021-10-20 20:45 ` Jeff King
2021-10-21 6:38 ` Alex Henrie [this message]
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=CAMMLpeQYSWyhM92RDQuK0TSkNcbuE06_8RQiYHtz_JDYmXJXMA@mail.gmail.com \
--to=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ka37@calvin.edu \
--cc=peff@peff.net \
/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).