Merge branch 'jk/tighten-alloc'

diff --git a/diffcore-break.c b/diffcore-break.c
index 5473493e10551633659d0727626ffc2273ef4f73..881a74f29e4f6033a2547f2558a5ad8a3eaad584 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -57,8 +57,8 @@ static int should_break(struct diff_filespec *src,
                return 1; /* even their types are different */
        }
 
-       if (src->sha1_valid && dst->sha1_valid &&
-           !hashcmp(src->sha1, dst->sha1))
+       if (src->oid_valid && dst->oid_valid &&
+           !oidcmp(&src->oid, &dst->oid))
                return 0; /* they are the same */
 
        if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))