From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 21 Jan 2008 00:19:38 GMT
Subject: Re: [PATCH] Also use unpack_trees() in do_diff_cache()
Message-ID: <alpine.LSU.1.00.0801210017580.5731@racer.site>
In-Reply-To: <alpine.LFD.1.00.0801201550550.2957@woody.linux-foundation.org>

Hi,

On Sun, 20 Jan 2008, Linus Torvalds wrote:

> On Sun, 20 Jan 2008, Johannes Schindelin wrote:
> > 
> > Note: "git diff HEAD" as it is now still holds value;
> 
> Oh, absolutely.
> 
> It's not "git diff HEAD" that is broken.
> 
> It's "git diff --cached HEAD" that doesn't work. The "--cached" means 
> that it's supposed to diff the index against HEAD, but since it cannot 
> handle unmerged entries, instead of getting a diff, you get just a line 
> saying
> 
> 	* Unmerged path xyzzy
> 
> and no diff at all.

Silly me.  Unmerged paths can only have problems when you look at the 
index, of course.

Sorry for the noise,
Dscho