summaryrefslogtreecommitdiff
path: root/cache-tree.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2018-10-02 21:19:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-04 10:42:48 (GMT)
commite43d2dcce1db256e95b90f89e06d62834a1d361c (patch)
tree72b717680d6b340c71a970c29e7996d0e5b1ec35 /cache-tree.c
parentfe8321ec057f9231c26c29b364721568e58040f7 (diff)
downloadgit-e43d2dcce1db256e95b90f89e06d62834a1d361c.zip
git-e43d2dcce1db256e95b90f89e06d62834a1d361c.tar.gz
git-e43d2dcce1db256e95b90f89e06d62834a1d361c.tar.bz2
more oideq/hasheq conversions
We added faster equality-comparison functions for hashes in 14438c4497 (introduce hasheq() and oideq(), 2018-08-28). A few topics were in-flight at the time, and can now be converted. This covers all spots found by "make coccicheck" in master (the coccicheck results were tweaked by hand for style). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache-tree.c')
-rw-r--r--cache-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache-tree.c b/cache-tree.c
index 5ce5146..9c5cf2c 100644
--- 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));