From: Miklos Vajna <vmiklos@frugalware.org>
Date: Tue, 03 Jun 2008 23:11:51 GMT
Subject: Re: Octopus merge: unique (?) to git, but is it useful?
Message-ID: <20080603231151.GR29404@genesis.frugalware.org>
In-Reply-To: <alpine.LFD.1.10.0806030738340.3473@woody.linux-foundation.org>

On Tue, Jun 03, 2008 at 07:40:21AM -0700, Linus Torvalds <torvalds@linux-foundation.org> wrote:
> Right. But git shouldn't do duplicate parents. I agree it's a mis-use of 
> git merge, but either we should have errored out or we should have pruned 
> the parents.
> 
> Yes, the end result is "tecnically correct", but it's not optimal.

I think the current git-merge.sh already handles this: 6ea23343
introduced the usage of git-show-branch --independent to filter out
duplicated parents.