Re: Comments on recursive merge..

From: Junio C Hamano <junkio@cox.net>
Date: Nov 9, 2005, 00:59 UTC
Message-ID: <7vlkzyd4aq.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0511081646160.3247@g5.osdl.org>

Linus Torvalds <torvalds@osdl.org> writes:

> Junio? You even wrote the comment about the case in git-merge-base, I'm 
> wondering whether it's a bug that we use the fast-and-cheap algorithm in 
> git-show-branch..

I did show-branch soon after we worked on those pathlogical merge-base fix, so I would be a bit surprised if I did it without using all the knowledge from that exercise, but I do not remember offhand. The core logic should be simple generalization of two-head merge-base to N heads.

$ 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.