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>
This commit is contained in:
committed by
Junio C Hamano
parent
e3ff0683e2
commit
9001dc2a74
@ -902,7 +902,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
|
||||
oidclr(&curr_head);
|
||||
|
||||
if (!is_null_oid(&orig_head) && !is_null_oid(&curr_head) &&
|
||||
oidcmp(&orig_head, &curr_head)) {
|
||||
!oideq(&orig_head, &curr_head)) {
|
||||
/*
|
||||
* The fetch involved updating the current branch.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user