Re: [PATCH] git-am: add am.threeWay config variable

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Aug 19, 2015, 09:45 UTC
Message-ID: <vpq4mjv7gsd.fsf@anie.imag.fr>
In-Reply-To: <CACRoPnTY8mALN8KbjR0CHeaKOkm2oSLRL9=4X1tU1LmHiJTeNg@mail.gmail.com>

Paul Tan <pyokagan@gmail.com> writes:

Show 14 quoted lines

> 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".

OK, perfect. I had missed that. Thanks again.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/