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

Re: octopus limit

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 27, 2008, 12:00 UTC
Message-ID
<alpine.DEB.1.00.0806271259440.9925@racer>
In-Reply-To
<alpine.LFD.1.10.0806262243130.2988@localhost.localdomain>
Hi,
On Thu, 26 Jun 2008, Len Brown wrote:
> it would be nice if a merge of more than 16 branches failed right at the 
> start, rather than chunking along doing merges and then giving up, 
> leaving my repo in an intermediate state.

FWIW I think the rewrite of git-merge as a builtin, which is currently in the works, lifts the limit. However, this is only true if you do not use a custom script which calls commit-tree.

Ciao, Dscho

Previous: Miklos VajnaNext: Johannes Schindelin
Message 4 of 9 in “octopus limit”
  1. Len BrownJun 27, 2008
  2. Matthieu MoyJun 27, 2008
  3. Miklos VajnaJun 27, 2008
  4. Johannes SchindelinJun 27, 2008
  5. commit-tree: lift completely arbitrary limit of 16 parentsJohannes Schindelin, Jun 27, 2008
  6. Johannes SixtJun 27, 2008
  7. Johannes SchindelinJun 27, 2008
  8. Junio C HamanoJun 27, 2008
  9. Johannes SchindelinJun 27, 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.