From: Linus Torvalds <torvalds@osdl.org>
Date: Thu, 09 Jun 2005 00:41:56 GMT
Subject: Re: Handling merge conflicts a bit more gracefully..
Message-ID: <Pine.LNX.4.58.0506081738000.2286@ppc970.osdl.org>
In-Reply-To: <7vzmu01jmc.fsf@assigned-by-dhcp.cox.net>



On Wed, 8 Jun 2005, Junio C Hamano wrote:
> 
> I do not think you can, unless you are willing to parse shell
> error messages, which I do not want you to be willing to ;-).

Yeah, no. 

> I think you have a bigger problem of leading paths, BTW.

Gotcha. I committed a largely untested fix that hopefully does this all 
right.

I'm currently using your suggested thing (inside a function), but I think 
I'll instead make it do

	git-update-cache --add --cacheinfo ... &&
		git-checkout-cache -u -f "$4"

which seems even simpler.

		Linus