Re: merge weirdness

From: Len Brown <lenb@kernel.org>
Date: Jun 13, 2008, 05:00 UTC
Message-ID: <alpine.LFD.1.10.0806130049420.8340@localhost.localdomain>
In-Reply-To: <alpine.LFD.1.10.0806130028080.8340@localhost.localdomain>

On Fri, 13 Jun 2008, Len Brown wrote:

Show 18 quoted lines

> I merged about a dozen small branches earlier this week and sent the batch 
> to Linus, who pulled them upstream with 
> da50ccc6a0f32ad29c1168837330a78e6e2e2923
> 
> I pulled Linus' tree and then went to compare which of my branches had 
> made it upstream, and my topic branches "git.status" script (pasted 
> below) said that none of them had!
> 
> Looking at Linus' history, it seems that my merge is gone.  Instead there 
> is a series of patches that look like they've been cherry-picked -- same 
> commit but different commit id.
> 
> I run the top-of-tree version of git.
> Did something strange happen with git a few days ago in this department?
> 
> I still had my merge in command history so I checked out an old branch and 
> did the same merge using today's git (git version 1.5.6.rc2.26.g8c37)
> and gitk shows it as an octopus, as expected.

I think I figured out what happened.

I prepared the original history, as shown in the commit-id's in this shortlog:

http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/release/2.6.26/acpi-release-20080321-2.6.26-rc5.diff.bz2

Then some time passed and Linus pushed a few more things into his tree.

I figured I'd merge with his latest to avoid any last minute merge conflicts for him.

But instead of "git pull" to merge linus into release, for some reason I did a "git rebase linus release" -- which re-checked in my commits and flattened all of my branches into a random sequence of patches.

I'll not do that again...

sorry for the noise.

thanks, -Len