git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: "Not possible to fast-forward" when pull.ff=only and new commits on remote

From
Jeff King <peff@peff.net>
Date
Oct 20, 2021, 20:36 UTC
Message-ID
<YXB94Y4mqm8GpsfV@coredump.intra.peff.net>
In-Reply-To
<xmqqa6j3pkqw.fsf@gitster.g>
On Wed, Oct 20, 2021 at 12:19:19PM -0700, Junio C Hamano wrote:
Show 12 quoted lines
> > Running a sequence of traversals like this can be slow, because we may
> > walk over the same history again and again. But I think in the usual
> > non-octopus cases we'd only have one entry, so we'd only be adding a
> > single extra merge-base traversal in most cases.
> >
> > It does feel like this could be combined with get_can_ff() somehow so
> > that we're not adding even that single traversal. But I expect that may
> > be hard to do because of the multiple heads (e.g., we cannot use the
> > usual ahead/behind code).
> 
> I'd leave such an optimization as a separate topic.  This was meant
> to be a regression fix.

Yeah, I'm definitely OK with that. You might be making performance a little worse with your patch, but getting correctness right is much more important.

-Peff
Previous: Junio C HamanoNext: Junio C Hamano
Message 6 of 9 in “"Not possible to fast-forward" when pull.ff=only and new commits on remote”
  1. Kenneth ArnoldOct 19, 2021
  2. Jeff KingOct 19, 2021
  3. Junio C HamanoOct 20, 2021
  4. Jeff KingOct 20, 2021
  5. Junio C HamanoOct 20, 2021
  6. Jeff KingOct 20, 2021
  7. pull: --ff-only should make it a noop when already-up-to-dateJunio C Hamano, Oct 20, 2021
  8. Jeff KingOct 20, 2021
  9. Alex HenrieOct 21, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.