diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2017-11-29 12:11:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-02 22:16:57 -0800 |
| commit | 89973554b52cb533b01acfdcb16d8215344bf004 (patch) | |
| tree | ae487a6e870e169d0ee5f4b3f5cffe230897d719 /diffcore-rename.c | |
| parent | 9268cf4a2ef61c334204b1237b2174a77d16f98d (diff) | |
| download | git-89973554b52cb533b01acfdcb16d8215344bf004.tar.gz git-89973554b52cb533b01acfdcb16d8215344bf004.tar.xz | |
diffcore-rename: make diff-tree -l0 mean -l<large>
In the documentation of diff-tree, it is stated that the -l option
"prevents rename/copy detection from running if the number of
rename/copy targets exceeds the specified number". The documentation
does not mention any special handling for the number 0, but the
implementation before commit 9f7e4bfa3b ("diff: remove silent clamp of
renameLimit", 2017-11-13) treated 0 as a special value indicating that
the rename limit is to be a very large number instead.
The commit 9f7e4bfa3b changed that behavior, treating 0 as 0. Revert
this behavior to what it was previously. This allows existing scripts
and tools that use "-l0" to continue working. The alternative (to have
"-l0" suppress rename detection) is probably much less useful, since
users can just refrain from specifying -M and/or -C to have the same
effect.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-rename.c')
| -rw-r--r-- | diffcore-rename.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index 9ca0eaec7..245e999fe 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -392,6 +392,8 @@ static int too_many_rename_candidates(int num_create, * * num_create * num_src > rename_limit * rename_limit */ + if (rename_limit <= 0) + rename_limit = 32767; if ((num_create <= rename_limit || num_src <= rename_limit) && ((uint64_t)num_create * (uint64_t)num_src <= (uint64_t)rename_limit * (uint64_t)rename_limit)) |