From: Miklos Vajna <vmiklos@frugalware.org>
Date: Sun, 05 Oct 2008 19:43:40 GMT
Subject: Re: [PATCH] builtin-commit: use reduce_heads() only when appropriate
Message-ID: <20081005194340.GT23137@genesis.frugalware.org>
In-Reply-To: <20081003150927.GG6839@neumann>

On Fri, Oct 03, 2008 at 05:09:27PM +0200, SZEDER Gábor <szeder@ira.uka.de> wrote:
>   I think this should be squashed onto Miklós' patch.

I'll resend a squashed patch with your signoff included.

>   I'm not sure about putting these two new test into t7600-merge.sh.
>   Although the infrastructure to keep these tests very short (repo with
>   branches already set up, verify_parents) is there available, the first
>   test tests not only merge, but the cooperation of merge and commit,
>   and this second one tests only commit.

Given that originally it was git-merge.sh that did this reduction, I
think it's OK.