Re: new behaviour in git merge

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Feb 24, 2011, 09:24 UTC
Message-ID: <20110224202454.d3b8668e.sfr@canb.auug.org.au>
In-Reply-To: <20110224081553.GD25595@sigill.intra.peff.net>

Hi Jeff,

On Thu, 24 Feb 2011 03:15:53 -0500 Jeff King <peff@peff.net> wrote:

>
> I don't think any such change was intentional.  I couldn't reproduce

I was hoping that it was not intentional :-)

> with a trivial example. Can you give the commit IDs of the two heads in

I also tried a trivial example but failed to reproduce it.

> your example merge? I'd like to try bisecting if I can reproduce the
> issue.

In today's linux-next tree (available at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git), commit ad11c1e8abca18872c2993b09b1abde418955b6c is just before the merge and commit a2c06ee2fe5b48a71e697bae00c6e7195fc016b6 is what was merged.

I just did this in a copy of my tree:

	git reset --hard ad11c1e8abca18872c2993b09b1abde418955b6c
	sleep 90
	git merge a2c06ee2fe5b48a71e697bae00c6e7195fc016b6

A comparison of the ls -lR ouput before and after showed a lot of changed modification times.

Several other merges showed the same problem.

Thanks for looking at this.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/