From: Daniel Barkalow <barkalow@iabervon.org>
Date: Tue, 06 Sep 2005 18:28:39 GMT
Subject: Re: bogus merges
Message-ID: <Pine.LNX.4.63.0509061409180.23242@iabervon.org>
In-Reply-To: <Pine.LNX.4.58.0509050853080.3568@evo.osdl.org>

On Mon, 5 Sep 2005, Linus Torvalds wrote:

> On Mon, 5 Sep 2005, Wayne Scott wrote:
> >
> > A recent commit in linux-2.6 looks like this:
> 
> It hopefully shouldn't happen any more with the improved and fixed
> git-merge-base.

Couldn't it also happen if there's stale data in MERGE_HEAD when you 
commit a normal patch? The description doesn't look like a merge at all, 
but rather like a normal patch that inappropriately picked up an extra 
head. I'd guess he tried to merge something, got a conflict, decided that 
he didn't really want to do that anyway, switched to a different branch, 
applied a patch, and committed without noticing the note that he seemed to 
be committing a merge.

Probably the right thing is actually to clean up more when switching 
tasks, but it would probably also be worth checking that merges make sense 
as well.

	-Daniel
*This .sig left intentionally blank*