diff options
author | Jeff King <peff@peff.net> | 2018-08-28 23:22:44 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-29 20:32:49 +0200 |
commit | e3ff0683e22070ce42c3c373f6e89e9dc38b756c (patch) | |
tree | cf66b2e24d19b147c0bf10bab25ae4222978a2ab /pack-objects.c | |
parent | convert "oidcmp() == 0" to oideq() (diff) | |
download | git-e3ff0683e22070ce42c3c373f6e89e9dc38b756c.tar.xz git-e3ff0683e22070ce42c3c373f6e89e9dc38b756c.zip |
convert "hashcmp() == 0" to hasheq()
This is the partner patch to the previous one, but covering
the "hash" variants instead of "oid". Note that our
coccinelle rule is slightly more complex to avoid triggering
the call in hasheq().
I didn't bother to add a new rule to convert:
- hasheq(E1->hash, E2->hash)
+ oideq(E1, E2)
Since these are new functions, there won't be any such
existing callers. And since most of the code is already
using oideq, we're not likely to introduce new ones.
We might still see "!hashcmp(E1->hash, E2->hash)" from topics
in flight. But because our new rule comes after the existing
ones, that should first get converted to "!oidcmp(E1, E2)"
and then to "oideq(E1, E2)".
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-objects.c')
-rw-r--r-- | pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pack-objects.c b/pack-objects.c index 6ef87e5683..2bc7626997 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -16,7 +16,7 @@ static uint32_t locate_object_entry_hash(struct packing_data *pdata, while (pdata->index[i] > 0) { uint32_t pos = pdata->index[i] - 1; - if (!hashcmp(sha1, pdata->objects[pos].idx.oid.hash)) { + if (hasheq(sha1, pdata->objects[pos].idx.oid.hash)) { *found = 1; return i; } |