From: Junio C Hamano <junkio@cox.net>
Date: Fri, 08 Dec 2006 06:01:52 GMT
Subject: Re: Bug in merge-recursive in virtual commit corner case
Message-ID: <7vd56vorhr.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20061207192401.GB12143@spearce.org>

Shawn Pearce <spearce@spearce.org> writes:

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

No, that is not related at all.  My initial attempt (which is
not in any commit that survives til today) used hash_sha1_file()
on the result from xdl_merge() where I should have used
write_sha1_file(), and I saw the same "oh, the required object
is not there" errors from everywhere.