convert "oidcmp() != 0" to "!oideq()"

[thirdparty/git.git] / diff-lib.c

diff --git a/diff-lib.c b/diff-lib.c
index c1f5a5265433abe1d011d46c69d8d97316ce2fda..8866b1d60c0e390160f5cbc5bee1189736775e52 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -342,7 +342,7 @@ static int show_modified(struct rev_info *revs,
        }
 
        if (revs->combine_merges && !cached &&
-           (oidcmp(oid, &old_entry->oid) || oidcmp(&old_entry->oid, &new_entry->oid))) {
+           (!oideq(oid, &old_entry->oid) || !oideq(&old_entry->oid, &new_entry->oid))) {
                struct combine_diff_path *p;
                int pathlen = ce_namelen(new_entry);