X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diffcore-break.c;h=acb18db1db27dc29fdb76bd519174aa56f56121d;hb=b6936205e73c058784288d21d1937e5bba26b91b;hp=71ad58a25a05ea760fd67fc1583e3323dd53a8f6;hpb=c827a84c694f95a9c2e179192d34c33eccdbb10a;p=git.git

diff --git a/diffcore-break.c b/diffcore-break.c
index 71ad58a25..acb18db1d 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -56,7 +56,7 @@ static int should_break(struct diff_filespec *src,
 		return 0; /* leave symlink rename alone */
 
 	if (src->sha1_valid && dst->sha1_valid &&
-	    !memcmp(src->sha1, dst->sha1, 20))
+	    !hashcmp(src->sha1, dst->sha1))
 		return 0; /* they are the same */
 
 	if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
@@ -68,6 +68,7 @@ static int should_break(struct diff_filespec *src,
 
 	if (diffcore_count_changes(src->data, src->size,
 				   dst->data, dst->size,
+				   NULL, NULL,
 				   0,
 				   &src_copied, &literal_added))
 		return 0;