From: Linus Torvalds <torvalds@osdl.org>
Date: Wed, 27 Apr 2005 00:29:12 GMT
Subject: Re: [PATCH] diff-cache/tree compatible output for show-diff (take 2).
Message-ID: <Pine.LNX.4.58.0504261725470.18901@ppc970.osdl.org>
In-Reply-To: <Pine.LNX.4.58.0504261719230.18901@ppc970.osdl.org>



On Tue, 26 Apr 2005, Linus Torvalds wrote:
>
> [ "U" for "unmerged" ]
> 
> Btw, diff-cache definitely _can_ output this form, so we probably should 
> make diff-cache do so too, to match, no?

Actually, we should decide on what diff-tree-helper does before that. 
Right now it always either calls out to the external diff program, or it 
says "cannot parse".

It's possible that an external "diff" program might actually want to know
about unmerged files (maybe people don't actually do "diff", but something
else altogether), so one approach might be to just make that an option.

The other approach is to just have something like "<pathname> is unmerged"
as output from diff-tree-helper. That isn't quite as flexible, but it sure 
is simpler..

		Linus