From: Junio C Hamano Date: Sun, 22 May 2005 08:31:28 +0000 (-0700) Subject: [PATCH] Fix tweak in similarity estimator. X-Git-Tag: v0.99~506 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd1870edb6658d8118ed6015651a0ff080ae7162 [PATCH] Fix tweak in similarity estimator. There was a screwy math bug in the estimator that confused what -C1 meant and what -C9 meant, only in one of the early "cheap" check, which resulted in quite confusing behaviour. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff --git a/diffcore-rename.c b/diffcore-rename.c index 28b1de25de..ff5c182df8 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -77,12 +77,12 @@ static int estimate_similarity(struct diff_filespec *src, /* We would not consider edits that change the file size so * drastically. delta_size must be smaller than - * minimum_score/MAX_SCORE * min(src->size, dst->size). + * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size). * Note that base_size == 0 case is handled here already * and the final score computation below would not have a * divide-by-zero issue. */ - if (base_size * minimum_score < delta_size * MAX_SCORE) + if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE) return 0; delta = diff_delta(src->data, src->size,