Re: [PATCH v2 0/5] Tests and fixes for merge-recursive rename options

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 22, 2016, 22:29 UTC
Message-ID: <xmqqwppw4bvw.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CALMa68qmGie+AHOWZ=BKHZOeSK9K4djiHRuooCz2h72rNZg7_A@mail.gmail.com>

Felipe Gonçalves Assis <felipeg.assis@gmail.com> writes:

Show 9 quoted lines

>> As I said, I am reluctant to take the 25%/50%/75% tests in their
>> current form.  Let me take the first one and a half of the last one
>> (i.e. excluding the test) for now.
>>
>> Thanks.
>
> Ok, should I post a new version of the patch without the tests while I
> rework them or does that mean that you have already filtered them out
> locally?

I already have and queued them tentatively as

    c443d39 merge-recursive: find-renames resets threshold
    83837ec merge-strategies.txt: fix typo

but they haven't been merged to 'next', so it is up to you whether you rebuild the remainder on top of c443d39 or redo these 5 patches altogether (just tell me to drop these two if you go the latter route).

Thanks.