Fix a few small issues with documentation and warnings around the limits for the quadratic portion of rename (©) detection, and bump the default limits. Discussion on bumping the limits can be found at [1]. Although it appears we generally agree we could switch to an unlimited setting for merge.renameLimit, that would require some changes to progress bars to notify users how to take action once things start taking a while. So, for now, just bump the limits. [1] https://lore.kernel.org/git/CABPp-BFzp3TCWiF1QAVSfywDLYrz=GOQszVM-sw5p0rSB8RWvw@xxxxxxxxxxxxxx/T/#u Changes since v1: * Shuffled patch order since the explanation of why "inexact rename detection" is incorrect was in the third patch * Use the term "exhaustive rename detection" for the quadratic portion * Simplify -l description by just stating that it defaults to diff.renameLimit (since it in turn has the right default value) * Fix asciidoc formating * Include bump of the limits in a new patch Elijah Newren (4): diff: correct warning message when renameLimit exceeded doc: clarify documentation for rename/copy limits doc: document the special handling of -l0 Bump rename limit defaults (yet again) Documentation/config/diff.txt | 7 ++++--- Documentation/config/merge.txt | 10 ++++++---- Documentation/diff-options.txt | 12 ++++++++---- diff.c | 4 ++-- merge-ort.c | 2 +- merge-recursive.c | 2 +- 6 files changed, 22 insertions(+), 15 deletions(-) base-commit: d486ca60a51c9cb1fe068803c3f540724e95e83a Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1044%2Fnewren%2Frename-limit-documentation-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1044/newren/rename-limit-documentation-v2 Pull-Request: https://github.com/git/git/pull/1044 Range-diff vs v1: 3: 44a5d5efaa6 ! 1: 0d1d0f180a3 diff: correct warning message when renameLimit exceeded @@ Commit message detection" was an accurate way to refer to the quadratic portion of rename detection. However, that changed with commit bd24aa2f97a0 (diffcore-rename: guide inexact rename detection based on basenames, - 2021-02-14), so now the correct way to refer to quadratic rename - detection is "quadratic rename detection". Fix the warning accordingly. + 2021-02-14). Let's instead use the term "exhaustive rename detection" + to refer to the quadratic portion. Signed-off-by: Elijah Newren <newren@xxxxxxxxx> @@ diff.c: static int is_summary_empty(const struct diff_queue_struct *q) static const char rename_limit_warning[] = -N_("inexact rename detection was skipped due to too many files."); -+N_("quadratic rename detection was skipped due to too many files."); ++N_("exhaustive rename detection was skipped due to too many files."); static const char degrade_cc_to_c_warning[] = N_("only found copies from modified paths due to too many files."); 1: 7dc448df6ec ! 2: 4046993a9a2 doc: clarify documentation for rename/copy limits @@ Documentation/config/diff.txt: diff.orderFile:: - 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 quadratic portion of ++ 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. @@ Documentation/config/merge.txt: merge.verifySignatures:: - 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 quadratic portion of ++ 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 @@ Documentation/diff-options.txt: When used together with `-B`, omit also the prei - 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 number of rename/copy targets exceeds the specified ++ 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. -+ The `-M` and `-C` options can require O(n^2) processing time -+ where n is the number of potential rename/copy targets. This -+ option prevents the quadratic portion of rename/copy detection -+ from running if the number of rename/copy targets exceeds the -+ specified number. Defaults to diff.renameLimit, or if that is -+ also unspecified, to 400. ++ number. Defaults to diff.renameLimit. ifndef::git-format-patch[] --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]:: 2: ee0969429cb ! 3: 6f5767607cd doc: document the special handling of -l0 @@ Commit message ## Documentation/diff-options.txt ## @@ Documentation/diff-options.txt: of a delete/create pair. - specified number. Defaults to diff.renameLimit, or if that is - also unspecified, to 400. + exhaustive portion of rename/copy detection from running if + the number of rename/copy targets exceeds the specified + number. Defaults to diff.renameLimit. +++ ++Note that for backward compatibility reasons, a value of 0 is treated ++the same as if a large value was passed (currently, 32767). -+ Note that for backward compatibility reasons, a value of 0 is treated -+ the same as if 32767 was passed. -+ ifndef::git-format-patch[] --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]:: - Select only files that are Added (`A`), Copied (`C`), -: ----------- > 4: 8f1deb6dd16 Bump rename limit defaults (yet again) -- gitgitgadget
