On Wed, Jul 14 2021, Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@xxxxxxxxx>
>
> A few places in the docs implied that rename/copy detection is always
> quadratic or that all (unpaired) files were involved in the quadratic
> portion of rename/copy detection. The following two commits each
> introduced an exception to this:
>
> 9027f53cb505 (Do linear-time/space rename logic for exact renames,
> 2007-10-25)
> bd24aa2f97a0 (diffcore-rename: guide inexact rename detection based
> on basenames, 2021-02-14)
>
> (As a side note, for copy detection, the basename guided inexact rename
> detection is turned off and the exact renames will only result in
> sources (without the dests) being removed from the set of files used in
> quadratic detection. So, for copy detection, the documentation was
> closer to correct.)
>
> Avoid implying that all files involved in rename/copy detection are
> subject to the full quadratic algorithm. While at it, also note the
> default values for all these settings.
>
> Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
> ---
> Documentation/config/diff.txt | 7 ++++---
> Documentation/config/merge.txt | 10 ++++++----
> Documentation/diff-options.txt | 9 +++++----
> 3 files changed, 15 insertions(+), 11 deletions(-)
>
> diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt
> index 2d3331f55c2..e26a63d0d42 100644
> --- a/Documentation/config/diff.txt
> +++ b/Documentation/config/diff.txt
> @@ -118,9 +118,10 @@ diff.orderFile::
> relative to the top of the working tree.
>
> diff.renameLimit::
> - The number of files to consider when performing the copy/rename
> - detection; equivalent to the 'git diff' option `-l`. This setting
> - has no effect if rename detection is turned off.
> + The number of files to consider in the exhaustive portion of
> + copy/rename detection; equivalent to the 'git diff' option
> + `-l`. If not set, the default value is 400. This setting has
> + no effect if rename detection is turned off.
For both this...
> diff.renames::
> Whether and how Git detects renames. If set to "false",
> diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt
> index 6b66c83eabe..aca0c92dbe6 100644
> --- a/Documentation/config/merge.txt
> +++ b/Documentation/config/merge.txt
> @@ -33,10 +33,12 @@ merge.verifySignatures::
> include::fmt-merge-msg.txt[]
>
> merge.renameLimit::
> - The number of files to consider when performing rename detection
> - during a merge; if not specified, defaults to the value of
> - diff.renameLimit. This setting has no effect if rename detection
> - is turned off.
> + The number of files to consider in the exhaustive portion of
> + rename detection during a merge. If not specified, defaults
> + to the value of diff.renameLimit. If neither
> + merge.renameLimit nor diff.renameLimit are specified, defaults
> + to 1000. This setting has no effect if rename detection is
> + turned off.
...and this we should really have some wording to the effect of:
..., defaults to XYZ. The exact (or even approximate) default of XYZ
should not be relied upon, and may be changed (or these limits even
removed) in future versions of git.
I.e. let's distinguish a "this is how it works now, FYI" from a forward
promise that it's going to work like that forever.
Which also leads me to:
> merge.renames::
> Whether Git detects renames. If set to "false", rename detection
> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
> index 32e6dee5ac3..11e08c3fd36 100644
> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -588,11 +588,12 @@ When used together with `-B`, omit also the preimage in the deletion part
> of a delete/create pair.
>
> -l<num>::
> - The `-M` and `-C` options require O(n^2) processing time where n
> - is the number of potential rename/copy targets. This
> - option prevents rename/copy detection from running if
> + The `-M` and `-C` options have an exhaustive portion that
> + requires O(n^2) processing time where n is the number of
> + potential rename/copy targets. This option prevents the
> + exhaustive portion of rename/copy detection from running if
> the number of rename/copy targets exceeds the specified
> - number.
> + number. Defaults to diff.renameLimit.
This mention of O(n^2). This is not an issue with your patch/series, nd
this is an improvement.
But as a side-comment: Do we explain somewhere how exactly this
{diff,merge}.renmeLimit=N works for values of N? It's probably fine to
continue to handwave it away, but is there anything that say tells a
user what happens if they have 400 files in their repository in a "x"
directory and "git mv x y"? Will it work, but if they add a 401th file
it won't for diffs?
I *think* given a skimming of previous discussions that it's "no",
i.e. that this just kicks in for these expensive cases, and e.g. for
such a case of moving the same tree OID from "x" to "y" we'd
short-circuit things, but maybe I'm just making things up at this point.
Feel free to ignore me here, I guess this amounts to a request that it
would be great if we could point to some docs about how this works. It's
probably too much detail for Documentation/config/{merge,diff}.txt, so
maybe a section in either of git-{diff,merge}.txt ?
