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



On Sun, 16 Mar 2008, Daniel Barkalow wrote:
> 
> While you're at it, you should at least fix the comment. I actually think 
> it would be better to have update start out 0 and be set to CE_UPDATE 
> after verify_uptodate() and verify_absent(), since those checks are what 
> verifies that using CE_UPDATE is okay.

Well, I just made it match the old behavior. It used to be that the 
copy_cache_entry() would clear the CE_UPDATE bit in the target 'merge' 
entry, so I just cleared "update" there, the way we used to do it.

So now we actually *do* match the comment again - the bug was that we 
didn't match it before due to it all being a bit too subtle.

		Linus