X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diffcore-break.c;h=cab91a201acd9e3bb2ef09a810f13dc84185333b;hb=355e76a4a3c5e49ae15a642806457bce10fe2ef4;hp=c5e006df67f1f13c7e03c0c5f3cc01a9f981daba;hpb=f345b0a066572206aac4a4f9a57d746e213b6bff;p=git.git

diff --git a/diffcore-break.c b/diffcore-break.c
index c5e006df..cab91a20 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -23,7 +23,7 @@ static int very_different(struct diff_filespec *src,
 	 * want to get the filepair broken.
 	 */
 	void *delta;
-	unsigned long delta_size, base_size;
+	unsigned long delta_size, base_size, src_copied, literal_added;
 
 	if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
 		return 0; /* leave symlink rename alone */
@@ -61,10 +61,17 @@ static int very_different(struct diff_filespec *src,
 		return MAX_SCORE;
 
 	/* Estimate the edit size by interpreting delta. */
-	delta_size = count_delta(delta, delta_size);
+	if (count_delta(delta, delta_size, &src_copied, &literal_added)) {
+		free(delta);
+		return 0;
+	}
 	free(delta);
-	if (delta_size == UINT_MAX)
-		return 0; /* error in delta computation */
+
+	/* Extent of damage */
+	if (src->size + literal_added < src_copied)
+		delta_size = 0;
+	else
+		delta_size = (src->size - src_copied) + literal_added;
 
 	if (base_size < delta_size)
 		return MAX_SCORE;