X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-rename.c;h=6a52699f732c76540d71ce1500bd8d838ee8a265;hb=9153368d1bc296b6dbd0c3606a04a7274c6edc7e;hp=29609c74b6f312b59b7dde798ca5fc517c4a8bbb;hpb=75c42d8cc3b42e4b82946848b8ba902b4bbcc38d;p=git.git

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 29609c74..6a52699f 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -136,6 +136,7 @@ static int estimate_similarity(struct diff_filespec *src,
 	 */
 	void *delta;
 	unsigned long delta_size, base_size, src_copied, literal_added;
+	unsigned long delta_limit;
 	int score;
 
 	/* We deal only with regular files.  Symlink renames are handled
@@ -163,9 +164,13 @@ static int estimate_similarity(struct diff_filespec *src,
 	if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
 		return 0; /* error but caught downstream */
 
+	delta_limit = base_size * (MAX_SCORE-minimum_score) / MAX_SCORE;
 	delta = diff_delta(src->data, src->size,
 			   dst->data, dst->size,
-			   &delta_size, ~0UL);
+			   &delta_size, delta_limit);
+	if (!delta)
+		/* If delta_limit is exceeded, we have too much differences */
+		return 0;
 
 	/* A delta that has a lot of literal additions would have
 	 * big delta_size no matter what else it does.