From: Jeff King <peff@peff.net>
Date: Tue, 01 Mar 2011 19:36:03 GMT
Subject: Re: [PATCHv2 0/3] Fix unnecessary (mtime) updates of files during merge
Message-ID: <20110301193603.GB10082@sigill.intra.peff.net>
In-Reply-To: <20110301193142.GA10082@sigill.intra.peff.net>

On Tue, Mar 01, 2011 at 02:31:42PM -0500, Jeff King wrote:

> I think the fix you have for the first testcase is reasonable. It feels
> a little like a band-aid, as we are throwing away stat information early
> on and then pulling it again from the filesyste at the end. But from
> your description, the real fix to that would probably involve some
> changes to the way unpack_trees works, and that's probably complex
> enough that the band-aid is a good fix for now.

Oh, and I confirmed that it does fix Stephen's testcase, as well. With
the exception of some portability issues in the test case that JSixt
already pointed out:

Acked-by: Jeff King <peff@peff.net>

For what that's worth. This is the first time I've had to look at the
merge-recursive code in any depth. :)

-Peff