From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Bagas Sanjaya" <bagasdotme@gmail.com>,
"Elijah Newren" <newren@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Derrick Stolee" <stolee@gmail.com>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Elijah Newren" <newren@gmail.com>,
"Elijah Newren" <newren@gmail.com>
Subject: [PATCH v3 3/4] diffcore-rename: treat a rename_limit of 0 as unlimited
Date: Thu, 15 Jul 2021 00:45:23 +0000 [thread overview]
Message-ID: <00a2072baea435060b525b3907121bdf980461e9.1626309924.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1044.v3.git.git.1626309924.gitgitgadget@gmail.com>
From: Elijah Newren <newren@gmail.com>
In commit 89973554b52c (diffcore-rename: make diff-tree -l0 mean
-l<large>, 2017-11-29), -l0 was given a special magical "large" value,
but one which was not large enough for some uses (as can be seen from
commit 9f7e4bfa3b6d (diff: remove silent clamp of renameLimit,
2017-11-13). Make 0 (or a negative value) be treated as unlimited
instead and update the documentation to mention this.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
Documentation/diff-options.txt | 1 +
diffcore-rename.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 58acfff9289..0aebe832057 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -598,6 +598,7 @@ of a delete/create pair.
prevents the exhaustive portion of rename/copy detection from
running if the number of source/destination files involved
exceeds the specified number. Defaults to diff.renameLimit.
+ Note that a value of 0 is treated as unlimited.
ifndef::git-format-patch[]
--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 3375e24659e..513ba7b05f1 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -1021,7 +1021,7 @@ static int too_many_rename_candidates(int num_destinations, int num_sources,
* memory for the matrix anyway.
*/
if (rename_limit <= 0)
- rename_limit = 32767;
+ return 0; /* treat as unlimited */
if (st_mult(num_destinations, num_sources)
<= st_mult(rename_limit, rename_limit))
return 0;
--
gitgitgadget
next prev parent reply other threads:[~2021-07-15 0:45 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-11 0:46 [PATCH 0/3] Improve the documentation and warnings dealing with rename/copy limits Elijah Newren via GitGitGadget
2021-07-11 0:46 ` [PATCH 1/3] doc: clarify documentation for " Elijah Newren via GitGitGadget
2021-07-11 4:37 ` Bagas Sanjaya
2021-07-11 4:52 ` Elijah Newren
2021-07-12 15:03 ` Derrick Stolee
2021-07-12 21:27 ` Junio C Hamano
2021-07-11 0:46 ` [PATCH 2/3] doc: document the special handling of -l0 Elijah Newren via GitGitGadget
2021-07-11 4:54 ` Eric Sunshine
2021-07-11 4:54 ` Elijah Newren
2021-07-11 0:46 ` [PATCH 3/3] diff: correct warning message when renameLimit exceeded Elijah Newren via GitGitGadget
2021-07-12 15:09 ` Derrick Stolee
2021-07-12 18:13 ` Elijah Newren
2021-07-14 0:47 ` Junio C Hamano
2021-07-14 1:06 ` Elijah Newren
2021-07-14 1:10 ` Junio C Hamano
2021-07-14 1:22 ` Elijah Newren
2021-07-14 5:17 ` Junio C Hamano
2021-07-14 15:09 ` Elijah Newren
2021-07-14 1:12 ` [PATCH v2 0/4] Rename/copy limits -- docs, warnings, and new defaults Elijah Newren via GitGitGadget
2021-07-14 1:12 ` [PATCH v2 1/4] diff: correct warning message when renameLimit exceeded Elijah Newren via GitGitGadget
2021-07-14 1:12 ` [PATCH v2 2/4] doc: clarify documentation for rename/copy limits Elijah Newren via GitGitGadget
2021-07-14 7:37 ` Ævar Arnfjörð Bjarmason
2021-07-14 16:30 ` Elijah Newren
2021-07-14 22:08 ` Ævar Arnfjörð Bjarmason
2021-07-14 22:56 ` Elijah Newren
2021-07-14 1:12 ` [PATCH v2 3/4] doc: document the special handling of -l0 Elijah Newren via GitGitGadget
2021-07-14 16:45 ` Jeff King
2021-07-14 17:17 ` Elijah Newren
2021-07-14 17:33 ` Jeff King
2021-07-14 19:32 ` Elijah Newren
2021-07-14 1:12 ` [PATCH v2 4/4] Bump rename limit defaults (yet again) Elijah Newren via GitGitGadget
2021-07-14 16:43 ` Jeff King
2021-07-14 17:32 ` Elijah Newren
2021-07-14 17:57 ` Jeff King
2021-07-14 20:03 ` Elijah Newren
2021-07-14 20:47 ` Jeff King
2021-07-15 0:45 ` [PATCH v3 0/4] Rename/copy limits -- docs, warnings, and new defaults Elijah Newren via GitGitGadget
2021-07-15 0:45 ` [PATCH v3 1/4] diff: correct warning message when renameLimit exceeded Elijah Newren via GitGitGadget
2021-07-15 0:45 ` [PATCH v3 2/4] doc: clarify documentation for rename/copy limits Elijah Newren via GitGitGadget
2021-07-15 0:45 ` Elijah Newren via GitGitGadget [this message]
2021-07-15 23:17 ` [PATCH v3 3/4] diffcore-rename: treat a rename_limit of 0 as unlimited Junio C Hamano
2021-07-15 0:45 ` [PATCH v3 4/4] Bump rename limit defaults (yet again) Elijah Newren via GitGitGadget
2021-07-15 13:36 ` [PATCH v3 0/4] Rename/copy limits -- docs, warnings, and new defaults Derrick Stolee
2021-07-15 23:20 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=00a2072baea435060b525b3907121bdf980461e9.1626309924.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=avarab@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=stolee@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).