X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-break.c;h=0fc2b860bef30ee5a37b90df835e66f0dc74ab70;hb=a5370b16c34993c1d0f65171d5704244901e005b;hp=c57513a4fa83c58c5040ead38c52765051cd13f5;hpb=d9ad59e7636d98daa6131e9fd2cb2b4f5745a853;p=git.git

diff --git a/diffcore-break.c b/diffcore-break.c
index c57513a4..0fc2b860 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -4,8 +4,6 @@
 #include "cache.h"
 #include "diff.h"
 #include "diffcore.h"
-#include "delta.h"
-#include "count-delta.h"
 
 static int should_break(struct diff_filespec *src,
 			struct diff_filespec *dst,
@@ -47,7 +45,6 @@ static int should_break(struct diff_filespec *src,
 	 * The value we return is 1 if we want the pair to be broken,
 	 * or 0 if we do not.
 	 */
-	void *delta;
 	unsigned long delta_size, base_size, src_copied, literal_added;
 	int to_break = 0;
 
@@ -58,6 +55,10 @@ static int should_break(struct diff_filespec *src,
 	if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
 		return 0; /* leave symlink rename alone */
 
+	if (src->sha1_valid && dst->sha1_valid &&
+	    !memcmp(src->sha1, dst->sha1, 20))
+		return 0; /* they are the same */
+
 	if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
 		return 0; /* error but caught downstream */
 
@@ -65,19 +66,11 @@ static int should_break(struct diff_filespec *src,
 	if (base_size < MINIMUM_BREAK_SIZE)
 		return 0; /* we do not break too small filepair */
 
-	delta = diff_delta(src->data, src->size,
-			   dst->data, dst->size,
-			   &delta_size, 0);
-	if (!delta)
-		return 0; /* error but caught downstream */
-
-	/* Estimate the edit size by interpreting delta. */
-	if (count_delta(delta, delta_size,
-			&src_copied, &literal_added)) {
-		free(delta);
-		return 0; /* we cannot tell */
-	}
-	free(delta);
+	if (diffcore_count_changes(src->data, src->size,
+				   dst->data, dst->size,
+				   0,
+				   &src_copied, &literal_added))
+		return 0;
 
 	/* Compute merge-score, which is "how much is removed
 	 * from the source material".  The clean-up stage will