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

Re: [PATCH] Add --ff-only flag to git-merge

From
Yuval Kogman <nothingmuch@woobling.org>
Date
Jan 29, 2009, 20:57 UTC
Message-ID
<a891e1bd0901291257t774af061s84497cde8f4bf61c@mail.gmail.com>
In-Reply-To
<7vk58fm8x2.fsf@gitster.siamese.dyndns.org>
Hi,

I started incorperating your feedback but before I send a new patch I have several questions about the trickier bits:

2009/1/28 Junio C Hamano <gitster@pobox.com>:
>  * The placement of this misses the case where a merge of two unrelated
>   histories is attempted.  You would need to also have a check at "No
>   common ancestors found. We need a real merge." part.

Won't that fall through? The if (!common) is above, and this is eventually an else if for it (see line 978)

> The octopus
>   codepath could also end up with a fast forward or up-to-date.

So this case is obviously more convoluted... If an octopus merge is chosen should it just pass --ff-only to git-merge-octopus? Or maybe it should always pass --ff-only and the various different strategies would just die unconditionally?

Previous: Junio C HamanoNext: Junio C Hamano
Message 6 of 9 in “Add --ff-only flag to git-merge”
  1. Add --ff-only flag to git-mergeYuval Kogman, Jan 28, 2009
  2. Johannes SchindelinJan 28, 2009
  3. Yuval KogmanJan 28, 2009
  4. Sverre RabbelierJan 28, 2009
  5. Junio C HamanoJan 28, 2009
  6. Yuval KogmanJan 29, 2009
  7. Junio C HamanoJan 29, 2009
  8. Add --ff-only flag to git-merge (take 2)Yuval Kogman, Jan 30, 2009
  9. Add --ff-only flag to git-mergeYuval Kogman, Jan 30, 2009

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.