From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 16 Mar 2008 21:15:10 GMT
Subject: Re: [PATCH] Don't update unchanged merge entries
Message-ID: <alpine.LFD.1.00.0803161413250.3020@woody.linux-foundation.org>
In-Reply-To: <alpine.LNX.1.00.0803161700430.19665@iabervon.org>



On Sun, 16 Mar 2008, Daniel Barkalow wrote:
> 
> Well, the top part of the comment suggests that this is just an 
> optimization (don't bother to write out a file that you know is 
> unchanged), when it's actually necessary for correctness (since we don't 
> know if the working tree matches the old index).

Ahh, that part. Yeah, maybe we could expand/clarify it. I don't think the 
comment is wrong per se, but yes, I'm sure it could be improved. 

		Linus