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

Re: git merge performance problem..

From
Junio C Hamano <junkio@cox.net>
Date
Jul 16, 2006, 03:18 UTC
Message-ID
<7v7j2eme3u.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.64.0607151445270.5623@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
Show 11 quoted lines
> Junio, I think there is something wrong with git-merge. It sometimes takes 
> up to ten seconds, and it's stuck at the
>
> 	git-show-branch --independent "$head" "$@"
>
> call.
>
> I don't know quite what that thing is even meant to do (we do already know 
> the parents, why do we do something special here?) but even apart from 
> that, the whole thing must be doing something seriously wrong, since it 
> takes so long. Does it check the whole commit history?

The code is to cull redundant parents primarily in octopus and is not strictly necessary. Can I have the $head and $@ (the other merge parents, but in your case you never do an octopus so that would be the other branch head) to see what is going on please? It should not descend down the history all the way but with the recent changes to the object marking/unmarking code it is possible we might have broken something.

Previous: Linus TorvaldsNext: Junio C Hamano
Message 2 of 6 in “git merge performance problem..”
  1. Linus TorvaldsJul 15, 2006
  2. Junio C HamanoJul 16, 2006
  3. Junio C HamanoJul 16, 2006
  4. Linus TorvaldsJul 16, 2006
  5. Junio C HamanoJul 16, 2006
  6. Linus TorvaldsJul 16, 2006

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.