@matheusbsbs / matheus-bagliano / commits / 9f7e4bfa3b

diff: remove silent clamp of renameLimit

In commit 0024a5492 (Fix the rename detection limit checking; 2007-09-14), the renameLimit was clamped to 32767. This appears to have been to simply avoid integer overflow in the following computation: num_create * num_src <= rename_limit * rename_limit although it also could be viewed as a hardcoded bound on the amount of CPU time we're willing to allow users to tell git to spend on handling renames. An upper bound may make sense, but unfortunately this upper bound was neither communicated to the users, nor documented anywhere. Although large limits can make things slow, we have users who would be ecstatic to have a small five file change be correctly cherry picked even if they have to manually specify a large limit and wait ten minutes for the renames to be detected. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Nov 13, 2017 at 12:15 UTC 9f7e4bfa3b6da16e3690312ff208cc27706b2c1b

2 files changed +5 -8

diff.c

+1 -1

@@ -5454,7 +5454,7 @@ void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)

5454 warning(_(rename_limit_warning));

5455 else

5456 return;

5457 - if (0 < needed && needed < 32767)

5457 + if (0 < needed)

5458 warning(_(rename_limit_advice), varname, needed);

5459 }

5460

diffcore-rename.c

+4 -7

@@ -391,14 +391,10 @@ static int too_many_rename_candidates(int num_create,

391 * growing larger than a "rename_limit" square matrix, ie:

392 *

393 * num_create * num_src > rename_limit * rename_limit

394 - *

395 - * but handles the potential overflow case specially (and we

396 - * assume at least 32-bit integers)

394 */

398 - if (rename_limit <= 0 || rename_limit > 32767)

399 - rename_limit = 32767;

395 if ((num_create <= rename_limit || num_src <= rename_limit) &&

401 - (num_create * num_src <= rename_limit * rename_limit))

396 + ((uint64_t)num_create * (uint64_t)num_src

397 + <= (uint64_t)rename_limit * (uint64_t)rename_limit))

398 return 0;

399

400 options->needed_rename_limit =

@@ -415,7 +411,8 @@ static int too_many_rename_candidates(int num_create,

411 num_src++;

412 }

413 if ((num_create <= rename_limit || num_src <= rename_limit) &&

418 - (num_create * num_src <= rename_limit * rename_limit))

414 + ((uint64_t)num_create * (uint64_t)num_src

415 + <= (uint64_t)rename_limit * (uint64_t)rename_limit))

416 return 2;

417 return 1;

418 }