Fourth batch for 2.20

diff --git a/cache-tree.c b/cache-tree.c
index 5ce51468f0b402fd2121e2c8b51ff12703d431ba..9c5cf2cc4fdc1f2f4ccc7f352289fe0ec75e8f5d 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -781,7 +781,7 @@ static void verify_one(struct index_state *istate,
                strbuf_add(&tree_buf, oid->hash, the_hash_algo->rawsz);
        }
        hash_object_file(tree_buf.buf, tree_buf.len, tree_type, &new_oid);
-       if (oidcmp(&new_oid, &it->oid))
+       if (!oideq(&new_oid, &it->oid))
                BUG("cache-tree for path %.*s does not match. "
                    "Expected %s got %s", len, path->buf,
                    oid_to_hex(&new_oid), oid_to_hex(&it->oid));