kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'bs/maint-rename-populate-filespec' into maint 

* bs/maint-rename-populate-filespec:
  Rename detection: Avoid repeated filespec population
maint
Junio C Hamano 2009-01-28 23:42:57 -08:00
parent 0630a66f8a 885c716f0f
commit 9530eb1db8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
diffcore-rename.c
View File

@ -153,9 +153,9 @@ static int estimate_similarity(struct diff_filespec *src,
* is a possible size - we really should have a flag to * is a possible size - we really should have a flag to
* say whether the size is valid or not!) * 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; return 0;
if (!dst->cnt_data && diff_populate_filespec(dst, 0)) if (!dst->cnt_data && diff_populate_filespec(dst, 1))
return 0; return 0;


max_size = ((src->size > dst->size) ? src->size : dst->size); 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) if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
return 0; 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) delta_limit = (unsigned long)
(base_size * (MAX_SCORE-minimum_score) / MAX_SCORE); (base_size * (MAX_SCORE-minimum_score) / MAX_SCORE);
if (diffcore_count_changes(src, dst, if (diffcore_count_changes(src, dst,