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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Paul Tan <pyokagan@xxxxxxxxx> writes:

> On Tue, Aug 18, 2015 at 5:36 PM, Matthieu Moy
> <Matthieu.Moy@xxxxxxxxxxxxxxx> 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/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]