diff options
author | Jeff King <peff@peff.net> | 2018-08-28 21:22:48 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-29 18:32:49 (GMT) |
commit | 9001dc2a7493f1366a183c3a9175f608769321d5 (patch) | |
tree | 58340f7fbbbf2c49b376c43beac13ab7e39bf5dd /refs/files-backend.c | |
parent | e3ff0683e22070ce42c3c373f6e89e9dc38b756c (diff) | |
download | git-9001dc2a7493f1366a183c3a9175f608769321d5.zip git-9001dc2a7493f1366a183c3a9175f608769321d5.tar.gz git-9001dc2a7493f1366a183c3a9175f608769321d5.tar.bz2 |
convert "oidcmp() != 0" to "!oideq()"
This is the flip side of the previous two patches: checking
for a non-zero oidcmp() can be more strictly expressed as
inequality. Like those patches, we write "!= 0" in the
coccinelle transformation, which covers by isomorphism the
more common:
if (oidcmp(E1, E2))
As with the previous two patches, this patch can be achieved
almost entirely by running "make coccicheck"; the only
differences are manual line-wrap fixes to match the original
code.
There is one thing to note for anybody replicating this,
though: coccinelle 1.0.4 seems to miss the case in
builtin/tag.c, even though it's basically the same as all
the others. Running with 1.0.7 does catch this, so
presumably it's just a coccinelle bug that was fixed in the
interim.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs/files-backend.c')
-rw-r--r-- | refs/files-backend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index aa45f53..16ef932 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -841,7 +841,7 @@ static int verify_lock(struct ref_store *ref_store, struct ref_lock *lock, return 0; } } - if (old_oid && oidcmp(&lock->old_oid, old_oid)) { + if (old_oid && !oideq(&lock->old_oid, old_oid)) { strbuf_addf(err, "ref '%s' is at %s but expected %s", lock->ref_name, oid_to_hex(&lock->old_oid), |