[PATCH 3/3] diffcore-rename: improve estimate_similarity() heuristics
- From
Linus Torvalds <torvalds@linux-foundation.org>
- Date
- Feb 19, 2011, 04:30 UTC
- Message-ID
- <alpine.LFD.2.02.1102182028410.4165@i5.linux-foundation.org>
- In-Reply-To
- <alpine.LFD.2.02.1102182025270.4165@i5.linux-foundation.org>
From: Linus Torvalds <torvalds@linux-foundation.org> Date: Fri, 18 Feb 2011 20:12:06 -0800
The logic to quickly dismiss potential rename pairs was broken. It would too eagerly dismiss possible renames when all of the difference was due to pure new data (or deleted data).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---
This is the trivial one-liner, now with a changelog and sign-off. It changes the percentage of the size difference (delta_size) to be compared against the larger file size rather than the smaller file size.
diffcore-rename.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/diffcore-rename.c b/diffcore-rename.c index b9b039d..0cd4c13 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -170,7 +170,7 @@ static int estimate_similarity(struct diff_filespec *src, * and the final score computation below would not have a * divide-by-zero issue. */ - if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE) + if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE) return 0; if (!src->cnt_data && diff_populate_filespec(src, 0))
-- 1.7.4.1.51.g2bf8a