From: Linus Torvalds <torvalds@osdl.org>
Date: Wed, 30 Nov 2005 16:13:32 GMT
Subject: Re: git-name-rev off-by-one bug
Message-ID: <Pine.LNX.4.64.0511300813190.3099@g5.osdl.org>
In-Reply-To: <7vek4y1x79.fsf@assigned-by-dhcp.cox.net>



On Tue, 29 Nov 2005, Junio C Hamano wrote:
> 
> Actually there is one.  If we are asked to do diff -1 and an
> unmerged path does not have stage #2 but stage #1 entry exists,
> we would end up showing that stage #1, without telling the user
> that we are showing something different from what was asked.
> How about doing something like this, on top of yours?

Yes.

		Linus