Merge branch 'nd/complete-fetch-multiple-args'

diff --git a/diffcore-break.c b/diffcore-break.c
index c64359f489c87910b9d41756918dacda49276004..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))