Re: new file leaked onto release branch

From: Linus Torvalds <torvalds@osdl.org>
Date: Dec 14, 2005, 16:26 UTC
Message-ID: <Pine.LNX.4.64.0512140822540.3292@g5.osdl.org>
In-Reply-To: <7vmzj4yq3l.fsf@assigned-by-dhcp.cox.net>

On Wed, 14 Dec 2005, Junio C Hamano wrote:

Show 21 quoted lines

> 
> Gahhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh.
> 
> Forget about what I said.  Although all of what I said above are
> correct, I do not think it applies to your case at all --- these
> commits do not appear to be created by git-pull nor git-merge,
> and honestly, they look quite bogus.  There is something else
> going on.
> 
>         $ git cat-file commit 9115a6
>         tree da65904b8c0c0bc6c778b39bc25d06e07ca7c82c
>         parent 927fe18397b3b1194a5b26b1d388d97e391e5fd2
>         parent e4f5c82a92c2a546a16af1614114eec19120e40a
>         author Len Brown <len.brown@intel.com> 1133904460 -0500
>         committer Len Brown <len.brown@intel.com> 1133904460 -0500
> 
>         Auto-update from upstream
> 
>         $ git-merge-base 9115a6^1 9115a6^2; git-rev-parse 9115a6^2
>         e4f5c82a92c2a546a16af1614114eec19120e40a
>         e4f5c82a92c2a546a16af1614114eec19120e40a

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.

		Linus