X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-rename.c;h=625b589fb728e5ae94b3b13d419b43c30347508d;hb=cc44185f1f64ad8422c93d4c28944603bd1be719;hp=55cf1c37f344628eb06c40393295f288fb186a50;hpb=2486927d2ec9cc05ed7589540d103382d3751c10;p=git.git

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 55cf1c37..625b589f 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -170,19 +170,15 @@ static int estimate_similarity(struct diff_filespec *src,
 				   &src_copied, &literal_added))
 		return 0;
 
-	/* Extent of damage */
-	if (src->size + literal_added < src_copied)
-		delta_size = 0;
-	else
-		delta_size = (src->size - src_copied) + literal_added;
-
-	/*
-	 * Now we will give some score to it.  100% edit gets 0 points
-	 * and 0% edit gets MAX_SCORE points.
+	/* How similar are they?
+	 * what percentage of material in dst are from source?
 	 */
-	score = MAX_SCORE - (MAX_SCORE * delta_size / base_size); 
-	if (score < 0) return 0;
-	if (MAX_SCORE < score) return MAX_SCORE;
+	if (dst->size < src_copied)
+		score = MAX_SCORE;
+	else if (!dst->size)
+		score = 0; /* should not happen */
+	else
+		score = src_copied * MAX_SCORE / dst->size;
 	return score;
 }