Re: [RFC] diff-cache buglet

From: Linus Torvalds <torvalds@osdl.org>
Date: Apr 26, 2005, 18:06 UTC
Message-ID: <Pine.LNX.4.58.0504261103550.18901@ppc970.osdl.org>
In-Reply-To: <7vy8b5o211.fsf@assigned-by-dhcp.cox.net>

On Tue, 26 Apr 2005, Junio C Hamano wrote:

Show 7 quoted lines

> 
> While I agree with you that we should somehow show the stage, I
> do not like your suggestion above very much.  How about adding
> one column for stage number before the filename when --unmerged
> is given, just like show-files --stage shows?  You'd soon get
> used to the pattern that has a single digit in between
> whitespaces to recognize which is merged and which isn't.

Well, except for the fact that that isn't machine-readable either, since the "1 " thing might just be part of the filename..

But you could use "/" to guarantee that it's unique, together with knowing that git refuses to have non-canonical filenames.

Ie 1//filename.c _would_ be machine-readable, thanks to the "//" part, which cannot be part of a valid canonical git filename.

		Linus