git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
FAFelipe Gonçalves Assis <felipeg.assis@gmail.com>
Date
Feb 22, 2016, 22:37 UTC
Message-ID
<CALMa68pYL+x62zOKKrwS9VtH8Qm=-hbzARHN1kJ+4t-Hz+TpAA@mail.gmail.com>
In-Reply-To
<xmqqwppw4bvw.fsf@gitster.mtv.corp.google.com>
On 22 February 2016 at 19:29, Junio C Hamano <gitster@pobox.com> wrote:
Show 22 quoted lines
> Felipe Gonçalves Assis <felipeg.assis@gmail.com> writes:
>
>>> 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).
>

My original patch started with exactly those commits and then added the tests, so it is fine for me.

The motivation for the reorganisation was bundling the relevant test with the fix, but then it might be better to publish the fix soon, right?

Previous: Junio C Hamano
Message 11 of 11 in “Tests and fixes for merge-recursive rename options”
  1. 0/5 Tests and fixes for merge-recursive rename optionsFelipe Gonçalves Assis, Feb 21, 2016
  2. 1/5 merge-strategies.txt: fix typoFelipe Gonçalves Assis, Feb 21, 2016
  3. 2/5 t3034: add rename threshold testsFelipe Gonçalves Assis, Feb 21, 2016
  4. Junio C HamanoFeb 22, 2016
  5. 3/5 t3034: test option to disable renamesFelipe Gonçalves Assis, Feb 21, 2016
  6. 4/5 t3034: test deprecated interfaceFelipe Gonçalves Assis, Feb 21, 2016
  7. 5/5 merge-recursive: find-renames resets thresholdFelipe Gonçalves Assis, Feb 21, 2016
  8. Junio C HamanoFeb 22, 2016
  9. Felipe Gonçalves AssisFeb 22, 2016
  10. Junio C HamanoFeb 22, 2016
  11. Felipe Gonçalves AssisFeb 22, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.