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
Junio C Hamano <gitster@pobox.com>
Date
Feb 4, 2008, 07:24 UTC
Message-ID
<7vwsplkwuq.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<402c10cd0802032251y626f373eke66c35b200ccf5b1@mail.gmail.com>
"Sverre Hvammen Johansen" <hvammen@gmail.com> writes:
> I intend to also submit a patch that does fast forward in combination
> with a real merge.

Please make the next round an in-line patch. Attachments cannot be commented on, and an RFC patch is all about getting comments, not about being included. Whitespace breakages do not matter as much as the final submissions; readability and commentability matters more.

Instead of adding many new sub-strategies at once, I think it would make it easier to review to split the patch into (1) code movement without adding any functionality changes to make your further changes easier, if such a change is needed in your work (I did not really look at the attachment carefully), (2) add logic to find out the set of independent parents to remove redundant parents (perhaps using show-branch --independent? I dunno) and conditionally use it, (3) add infrastructure to allow adding different --ff=<what-to-do>, and then finally (4) a separate patch for each of <what-to-do>.

I suspect (2) is controversial if made unconditional. Some people do not even like the fast-forward "merges" we have traditionally done.

Previous: Sverre Hvammen JohansenNext: Sverre Hvammen Johansen
Message 4 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.