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

Re: Octopus merge: unique (?) to git, but is it useful?

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 4, 2008, 00:33 UTC
Message-ID
<7vbq2i11jz.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20080603231151.GR29404@genesis.frugalware.org>
Miklos Vajna <vmiklos@frugalware.org> writes:
Show 10 quoted lines
> On Tue, Jun 03, 2008 at 07:40:21AM -0700, Linus Torvalds <torvalds@linux-foundation.org> wrote:
>> Right. But git shouldn't do duplicate parents. I agree it's a mis-use of 
>> git merge, but either we should have errored out or we should have pruned 
>> the parents.
>> 
>> Yes, the end result is "tecnically correct", but it's not optimal.
>
> I think the current git-merge.sh already handles this: 6ea23343
> introduced the usage of git-show-branch --independent to filter out
> duplicated parents.

Good eyes. I guess I was sloppy when I wrote the log message for that one and failed to talk about the bugfix ;-).

Previous: Miklos VajnaNext: Junio C Hamano
Message 17 of 30 in “Octopus merge: unique (?) to git, but is it useful?”
  1. Jakub NarebskiJun 3, 2008
  2. Linus TorvaldsJun 3, 2008
  3. Junio C HamanoJun 3, 2008
  4. Junio C HamanoJun 3, 2008
  5. Johannes SchindelinJun 3, 2008
  6. Junio C HamanoJun 3, 2008
  7. Johannes SchindelinJun 3, 2008
  8. SZEDER GáborJun 3, 2008
  9. Junio C HamanoJun 3, 2008
  10. SZEDER GáborJun 3, 2008
  11. Junio C HamanoJun 3, 2008
  12. SZEDER GáborJun 3, 2008
  13. Jeff KingJun 4, 2008
  14. Junio C HamanoJun 4, 2008
  15. Linus TorvaldsJun 3, 2008
  16. Miklos VajnaJun 3, 2008
  17. Junio C HamanoJun 4, 2008
  18. Junio C HamanoJun 3, 2008
  19. Jakub NarebskiJun 3, 2008
  20. Junio C HamanoJun 3, 2008
  21. Jakub NarebskiJun 3, 2008
  22. Junio C HamanoJun 3, 2008
  23. Linus TorvaldsJun 3, 2008
  24. Commit annotations (was:: Octopus merge: unique (?) to git, but is it useful?)Jakub Narebski, Jun 3, 2008
  25. Johannes SchindelinJun 3, 2008
  26. Johan HerlandJun 3, 2008
  27. Daniel VilleneuveJun 3, 2008
  28. Matthieu MoyJun 3, 2008
  29. Jakub NarebskiJun 3, 2008
  30. Matthieu MoyJun 3, 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.