diff --git a/diffcore-break.c b/diffcore-break.c
index ed0e14c6d8b1b8347f20c890854972be6c6a234c..9c19b8cab778362b9d369135e743fb232a7cd295 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
return 0; /* leave symlink rename alone */
if (src->sha1_valid && dst->sha1_valid &&
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))
return 0; /* they are the same */
if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
* merge the surviving pair together if the score is
* less than the minimum, after rename/copy runs.
*/
* 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.
/* Extent of damage, which counts both inserts and
* deletes.