From: Paul Tan <pyokagan@gmail.com>
Date: Wed, 19 Aug 2015 08:33:36 GMT
Subject: Re: [PATCH] git-am: add am.threeWay config variable
Message-ID: <CACRoPnTY8mALN8KbjR0CHeaKOkm2oSLRL9=4X1tU1LmHiJTeNg@mail.gmail.com>
In-Reply-To: <vpqfv3h9bvf.fsf@anie.imag.fr>

On Tue, Aug 18, 2015 at 5:36 PM, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
> I don't remember the details of the regression we had with the shell
> version, but that would probably deserve an additional test to enforce
> the "Hopefully there will be no regressions" part of your message.

Actually, technically, I think this patch by its own would reintroduce
the regression ;)

The reason is that the bug was caused by the overall structure of the
git-am.sh code, and not the patch itself[1].

This is fixed in another patch series[2] on top of this patch which
also implements a test for "git am --3way".

[1] http://thread.gmane.org/gmane.comp.version-control.git/274577
[2] http://thread.gmane.org/gmane.comp.version-control.git/275322

Thanks,
Paul