X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=diffcore-break.c;h=ae8a7d03e2d103739897ac37fe1f9966956b9ec8;hb=db21872395a1a092faa85ef9c1ea53588d8414f0;hp=acb18db1db27dc29fdb76bd519174aa56f56121d;hpb=e866ffdf9b2add0e0981d19b3c212c4621fd8a57;p=git.git

diff --git a/diffcore-break.c b/diffcore-break.c
index acb18db1d..ae8a7d03e 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -66,8 +66,7 @@ static int should_break(struct diff_filespec *src,
 	if (base_size < MINIMUM_BREAK_SIZE)
 		return 0; /* we do not break too small filepair */
 
-	if (diffcore_count_changes(src->data, src->size,
-				   dst->data, dst->size,
+	if (diffcore_count_changes(src, dst,
 				   NULL, NULL,
 				   0,
 				   &src_copied, &literal_added))
@@ -89,7 +88,7 @@ static int should_break(struct diff_filespec *src,
 	 * merge the surviving pair together if the score is
 	 * less than the minimum, after rename/copy runs.
 	 */
-	*merge_score_p = src_removed * MAX_SCORE / src->size;
+	*merge_score_p = (int)(src_removed * MAX_SCORE / src->size);
 
 	/* Extent of damage, which counts both inserts and
 	 * deletes.