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

Re: What's cooking in git.git (Apr 2012, #05; Thu, 12)

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 16, 2012, 22:03 UTC
Message-ID
<7vwr5fs5a4.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CA+55aFyZYnAxJc8YT=GEnq-fdXbHCXyx937KNBngn69Zuxmcgg@mail.gmail.com>
Linus Torvalds <torvalds@linux-foundation.org> writes:
Show 12 quoted lines
> On Mon, Apr 16, 2012 at 10:29 AM, Junio C Hamano <gitster@pobox.com> wrote:
>>
>> I wonder if use of remoteheads later in the same function are correct,
>> though.  We equate "!remoteheads->next" and "We are not doing octopus",
>> for example.
>
> I do think it would generally be a great idea to never use
> "remoteheads" at all. An octopus merge that has been simplified to
> just two parents isn't really an octopus merge any more.
>
> So I think you're probably right - we should try to avoid using
> remoteheads entirely, and any use is suspect

I am still looking at the codepaths involved. It looks feasible, but would affect quite a lot of them to deal with many corner cases, I am afraid.

One of the worst is the "traditional merge format" where format-merge-msg is called outside "git merge" to prepare the merge message created by "git pull". We haven't reduced heads at that stage yet, so the message fed to us will list what happened on the redundant branches.

Previous: Linus TorvaldsNext: Junio C Hamano
Message 5 of 22 in “Re: What's cooking in git.git (Apr 2012, #05; Thu, 12)”
  1. Michal KiedrowiczApr 16, 2012
  2. Linus TorvaldsApr 16, 2012
  3. Junio C HamanoApr 16, 2012
  4. Linus TorvaldsApr 16, 2012
  5. Junio C HamanoApr 16, 2012
  6. 0/4 merge: reduce set of parents consistentlyJunio C Hamano, Apr 17, 2012
  7. 1/4 git-merge: test octopus with redundant parentsJunio C Hamano, Apr 17, 2012
  8. 2/4 builtin/merge.c: remove "remoteheads" global variableJunio C Hamano, Apr 17, 2012
  9. 3/4 builtin/merge.c: collect other parents earlyJunio C Hamano, Apr 17, 2012
  10. 4/4 builtin/merge.c: reduce parents earlyJunio C Hamano, Apr 17, 2012
  11. Junio C HamanoApr 16, 2012
  12. Linus TorvaldsApr 16, 2012
  13. Linus TorvaldsApr 16, 2012
  14. Michał KiedrowiczApr 16, 2012
  15. Linus TorvaldsApr 17, 2012
  16. git-merge: Reduce heads before trying to merge themMichał Kiedrowicz, Apr 17, 2012
  17. Junio C HamanoApr 17, 2012
  18. Linus TorvaldsApr 17, 2012
  19. Junio C HamanoApr 17, 2012
  20. Michał KiedrowiczApr 18, 2012
  21. Junio C HamanoApr 18, 2012
  22. Junio C HamanoApr 19, 2012

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.