Re: new file leaked onto release branch

From: Linus Torvalds <torvalds@osdl.org>
Date: Dec 14, 2005, 16:53 UTC
Message-ID: <Pine.LNX.4.64.0512140837160.3292@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0512140822540.3292@g5.osdl.org>

On Wed, 14 Dec 2005, Linus Torvalds wrote:

Show 7 quoted lines

> 
> Argh. 
> 
> Len, how old a git are you using? "git-merge" really should _never_ have 
> done this, but old (and I mean really old) git merges sometimes got 
> confused with the base parent and would create a merge even when it was 
> unnecessary.

Going through the real kernel tree, this has happened before:

	commit 8e9887cc3b8d9f1c88c6f3842346a9478e52718f
	Merge: 0a47c906342e2447003e207d23917dfa5c912071 d2149b542382bfc206cb28485108f6470c979566
	Author: Len Brown <len.brown@intel.com>
	Date:   Wed Nov 30 22:22:52 2005 -0500
	
	    Auto-update from upstream

and doing a

	git-merge-base -a 0a47c906342 d2149b542

results in the second parent: d2149b542382bfc206cb28485108f6470c979566.

We also have two old ones:

	commit b129a8ccd53f74c43e4c83c8e0031a4990040830
	commit 603fff54420a0ccc4c3b48bfef43896fb4e33161

but both of those are from June, and of known causes (Russell King using an old git that didn't clean up after a failed merge, and he ended up committing a perfectly normal change as a bogus merge because git would remember that broken MERGE_HEAD).

So Len, since you seem to use "git merge" in your scripts, I suspect you have an old version of git lying around. Can you try doing just

	git merge-base -a 0a47c906342e2447003e207d23917dfa5c912071 d2149b542382bfc206cb28485108f6470c979566

to see what the result is for you?

Also, maybe the _reason_ you have an old git lying around is that you have two installations - if you have at some point installed both an RPM _and_ recompiled your own git, you may have different git versions in ~/bin and in /usr/bin, and then depending on how you log in to the machine, you may end up with different versions being used..

			Linus