diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-16 16:16:07 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-16 16:16:08 +0900 |
| commit | ee56992a8792cd5e67029e71f3c75d7ce662ae6d (patch) | |
| tree | c98f7be58ae6d56b274225d24732697d15c318ac /cache-tree.c | |
| parent | Merge branch 'ma/mailing-list-address-in-git-help' (diff) | |
| parent | more oideq/hasheq conversions (diff) | |
| download | git-ee56992a8792cd5e67029e71f3c75d7ce662ae6d.tar.gz git-ee56992a8792cd5e67029e71f3c75d7ce662ae6d.zip | |
Merge branch 'jk/oideq-hasheq-cleanup'
Code clean-up.
* jk/oideq-hasheq-cleanup:
more oideq/hasheq conversions
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cache-tree.c b/cache-tree.c index 5ce51468f0..9c5cf2cc4f 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)); |