From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 03 Jun 2008 19:30:34 GMT
Subject: Re: Octopus merge: unique (?) to git, but is it useful?
Message-ID: <7vabi22u5h.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080603104009.GA559@neumann>

SZEDER Gábor <szeder@ira.uka.de> writes:

> On Mon, Jun 02, 2008 at 10:17:42PM -0700, Junio C Hamano wrote:
>> commit: drop duplicated parents
> have you actually tried the testcase 'Hand committing of a redundant
> merge removes dups' that you included with this commit (67bfc03)?

Yes, three times (because it is in three integration branches 'master',
'next' and 'pu') on two different machines (my primary development machine
and my k.org account before pushing the results out).

... and I just updated two of my office boxes.

> ...  It
> fails at the line 'EDITOR=: git commit -a'.

Sorry, because it works for me (and presumably for many others --- I
haven't seen anybody else reporting the breakage you have), you need to
help others to diagnose it with a bit more details.