mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'bs/maint-rename-populate-filespec' into maint
* bs/maint-rename-populate-filespec: Rename detection: Avoid repeated filespec population
This commit is contained in:
commit
9530eb1db8
|
@ -153,9 +153,9 @@ static int estimate_similarity(struct diff_filespec *src,
|
|||
* is a possible size - we really should have a flag to
|
||||
* say whether the size is valid or not!)
|
||||
*/
|
||||
if (!src->cnt_data && diff_populate_filespec(src, 0))
|
||||
if (!src->cnt_data && diff_populate_filespec(src, 1))
|
||||
return 0;
|
||||
if (!dst->cnt_data && diff_populate_filespec(dst, 0))
|
||||
if (!dst->cnt_data && diff_populate_filespec(dst, 1))
|
||||
return 0;
|
||||
|
||||
max_size = ((src->size > dst->size) ? src->size : dst->size);
|
||||
|
@ -173,6 +173,11 @@ static int estimate_similarity(struct diff_filespec *src,
|
|||
if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
|
||||
return 0;
|
||||
|
||||
if (!src->cnt_data && diff_populate_filespec(src, 0))
|
||||
return 0;
|
||||
if (!dst->cnt_data && diff_populate_filespec(dst, 0))
|
||||
return 0;
|
||||
|
||||
delta_limit = (unsigned long)
|
||||
(base_size * (MAX_SCORE-minimum_score) / MAX_SCORE);
|
||||
if (diffcore_count_changes(src, dst,
|
||||
|
|
Loading…
Reference in a new issue