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

Johannes Schindelin [off-list ref] wrote:

On Thu, 7 Dec 2006, Shawn Pearce wrote:

quoted

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.

Arrgh.  I can redo the merge and try to debug it myself; maybe I
can at least get enough details about what's going on to create a
dummy repo which exhibits the same behavior.
 

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

No, unfortunately for me (I wish I could let you debug this!).
Far too many legal issues are involved.  There is possible jail
time on my part for sharing any of the files in there...  ;-)

Although Junio mentioned he recently saw something like this in
git.git when he merged in your xdl_merge() code.  I wonder if its
the same issue.

--