Subject: Re: [PATCH] pretend-sha1: grave bugfix.

From: "Shawn O. Pearce" <[email-masked]>
Date: Fri, 16 Feb 2007 00:09:43 -0500

Johannes Schindelin <[email-masked]> wrote:
> On Thu, 15 Feb 2007, Junio C Hamano wrote:
> 
> >  * I wonder how recent merge-recursive with multiple merge bases
> >    (or an empty one) ever worked with this bug.  Am I
> >    hallucinating?
> 
> Probably the fact helped that merge-recursive only pretends 
> zero-sized blobs.

Most definately.  We never look at the pointer to an object's data if
len == 0, which it does in this case of merge-recursive's empty tree.

Aren't we using this for git-blame --contents?  How'd that ever
work for a non-empty file?

-- 
Shawn.