subtree: improve decision on merges kept in split

diff --git a/diffcore-break.c b/diffcore-break.c
index 881a74f29e4f6033a2547f2558a5ad8a3eaad584..e11fcfdb391425ac9efaea829d4756891dcb941e 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -58,7 +58,7 @@ static int should_break(struct diff_filespec *src,
        }
 
        if (src->oid_valid && dst->oid_valid &&
-           !oidcmp(&src->oid, &dst->oid))
+           oideq(&src->oid, &dst->oid))
                return 0; /* they are the same */
 
        if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
@@ -73,7 +73,6 @@ static int should_break(struct diff_filespec *src,
 
        if (diffcore_count_changes(src, dst,
                                   &src->cnt_data, &dst->cnt_data,
-                                  0,
                                   &src_copied, &literal_added))
                return 0;