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

Re: Merging using only fast-forward

From
Sverre Hvammen Johansen <hvammen@gmail.com>
Date
Jan 21, 2008, 06:26 UTC
Message-ID
<402c10cd0801202226y5bf3e00duf8ae190c6a751ee3@mail.gmail.com>
In-Reply-To
<7vzlv2858y.fsf@gitster.siamese.dyndns.org>
On Jan 19, 2008 2:43 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 8 quoted lines
> At one end of the spectrum, we have these crazy people who want
> git to record something that is not a merge at all as a merge
> with --no-ff.  At the other end of the spectrum, we have these
> other crazy people who want git to outsmart them by allowing
> them to throw random set of commits as potential parents,
> remove duplicates and figure out how many real parents the
> resulting merge should have (including the case that it may not
> even have any).

I am currently working on a patch for this. I have some new tests for this but more is needed and there is no documentation.

The only case that currently is not working is the case where I need to fast forward head and then do a merge. Do I need to update the files in the working directory twice (once after the fast forward and then once by the merge) or can I somehow get lets say git-merge-recursive to do this part for me?

The patch I have that handles the above failing case by not fast forwarding HEAD, but instead use it together with the other real_heads work (all tests succeed).

-- 
Sverre Hvammen Johansen
Previous: Sverre Hvammen JohansenNext: Sverre Hvammen Johansen
Message 13 of 15 in “Merging using only fast-forward”
  1. Sverre Hvammen JohansenJan 16, 2008
  2. Randal L. SchwartzJan 16, 2008
  3. Junio C HamanoJan 16, 2008
  4. Sverre Hvammen JohansenJan 16, 2008
  5. Junio C HamanoJan 16, 2008
  6. Sverre Hvammen JohansenJan 17, 2008
  7. Sverre Hvammen JohansenJan 18, 2008
  8. Junio C HamanoJan 18, 2008
  9. Sverre Hvammen JohansenJan 19, 2008
  10. Sverre Hvammen JohansenJan 19, 2008
  11. Junio C HamanoJan 19, 2008
  12. Sverre Hvammen JohansenJan 19, 2008
  13. Sverre Hvammen JohansenJan 21, 2008
  14. Sverre Hvammen JohansenJan 19, 2008
  15. Please don't reply to this threadSverre Hvammen Johansen, Jan 19, 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.