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

Re: [RFC/PATCH] Fast forward strategies only, common, fork and path

From
Sverre Hvammen Johansen <hvammen@gmail.com>
Date
Feb 4, 2008, 06:51 UTC
Message-ID
<402c10cd0802032251y626f373eke66c35b200ccf5b1@mail.gmail.com>
In-Reply-To
<402c10cd0802031654r3e0275a8s1d2163af9525e7d2@mail.gmail.com>
On Feb 3, 2008 4:54 PM, Sverre Hvammen Johansen <hvammen@gmail.com> wrote:
Show 6 quoted lines
> This patch also uses the real heads found instead of those
> specified for real merges.  This means that merge startegies
> that only take two heads can now accept more than two heads
> if they can be reduced down to only two real heads.  However,
> fast-forward of head in combination with a real merge is
> handled as before.

I intend to also submit a patch that does fast forward in combination with a real merge. This means that some case can be reduced down to only two real parents and we can select a twohead strategy instead of an octopus strategy. In cases where we have at least three real parents there is no point in doing this. We only need to specify the fast forwarded head right after head to allow git-merge-octopus to do its best.

I need some advise how to implement fast-forward in combination with a real merge. I know how to do this with an update of the directory tree and the index with the fast forward before the real merge is done. But, how canweI do this without updating the directory tree with the fast forward? Or is it OK to always update the directory with the intermediate state we get from the fast forward?

> --
> Sverre Hvammen Johansen
>
-- 
Sverre Hvammen Johansen
Previous: Stefan (metze) MetzmacherNext: Junio C Hamano
Message 3 of 14 in “Fast forward strategies only, common, fork and path”
  1. Fast forward strategies only, common, fork and pathSverre Hvammen Johansen, Feb 4, 2008
  2. Stefan (metze) MetzmacherFeb 4, 2008
  3. Sverre Hvammen JohansenFeb 4, 2008
  4. Junio C HamanoFeb 4, 2008
  5. Sverre Hvammen JohansenFeb 4, 2008
  6. Junio C HamanoFeb 4, 2008
  7. Sverre Hvammen JohansenFeb 5, 2008
  8. Jakub NarebskiFeb 5, 2008
  9. Junio C HamanoFeb 5, 2008
  10. Sverre Hvammen JohansenFeb 6, 2008
  11. Sverre Hvammen JohansenFeb 4, 2008
  12. Junio C HamanoFeb 4, 2008
  13. Sverre Hvammen JohansenFeb 4, 2008
  14. Sverre Hvammen JohansenFeb 4, 2008

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.