Re: [PATCH] merge-recursive: option to disable renames

From: Felipe Gonçalves Assis <felipeg.assis@gmail.com>
Date: Feb 16, 2016, 22:42 UTC
Message-ID: <CALMa68q+TgAXS0=xc1CpZ2nbzGb+TWafWCUXZhGrWPzFL5_AQQ@mail.gmail.com>
In-Reply-To: <xmqqegccmikn.fsf@gitster.mtv.corp.google.com>

On 16 February 2016 at 19:49, Junio C Hamano <gitster@pobox.com> wrote:

Show 17 quoted lines

> "Felipe Gonçalves Assis"  <felipeg.assis@gmail.com> writes:
>
>> +no-renames;;
>> +     Turn off rename detection.
>> +     See also linkgit:git-diff[1] `--no-renames`.
>
> Even though by default for merge-recursive the rename detection is
> on, if we are adding an option to control this aspect of the
> behaviour from the command line, it should follow the usual pattern,
> i.e.
>
>  (1) the code to parse options would allow an earlier "--no-renames"
>      on the command line to be overridden with a later "--renames"; and
>
>  (2) the description in the documentation would be headed by
>      "--[no-]renames", describes which one is the default, etc.
>

Just a note: In git-diff, there is no "--renames". Instead, renames are enabled by the "--find-renames[=<n>]" option.

1. Do you think "rename-threshold=<n>" should enable renames?
2. Should we have an option "find-renames" in merge?
3. Should git-diff have a "--renames" option?

I personally like your suggestion as it is. Just wanted to make sure you considered that while I work on the next patch.

Thanks, Felipe