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

Re: Bug in merge-recursive in virtual commit corner case

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 7, 2006, 15:38 UTC
Message-ID
<Pine.LNX.4.63.0612071636030.28348@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<20061207083531.GA22701@spearce.org>
Hi,
On Thu, 7 Dec 2006, Shawn Pearce wrote:
Show 11 quoted lines
> So I managed to create a fairly complex set of branches which are all
> merged back against each other at various points in time.  Two of
> them have 3 merge bases according to git-merge-base.  Tonight I
> tried to merge them together, but received the following wonderful
> error from git-merge-recursive:
> 
>   fatal: unable to read source tree (4b825dc642cb6eb9a060e54bf8d69288fbee4904)
> 
> For those in the know, that's the empty tree.  This particular 
> repository does not have the empty tree anywhere in it, which is why we 
> can't read the object: it doesn't exist, and shouldn't exist.

I think there is something else wrong. If you have three merge bases, I do not see how you could get into that particular code path.

Any possibility for me to have a private look at your repo?

Ciao, Dscho

Previous: Junio C HamanoNext: Shawn Pearce
Message 3 of 6 in “Bug in merge-recursive in virtual commit corner case”
  1. Shawn PearceDec 7, 2006
  2. Junio C HamanoDec 7, 2006
  3. Johannes SchindelinDec 7, 2006
  4. Shawn PearceDec 7, 2006
  5. Johannes SchindelinDec 8, 2006
  6. Junio C HamanoDec 8, 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.