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
@ -765,7 +765,7 @@ void write_commit_graph(const char *obj_dir,
|
||||
|
||||
count_distinct = 1;
|
||||
for (i = 1; i < oids.nr; i++) {
|
||||
if (oidcmp(&oids.list[i-1], &oids.list[i]))
|
||||
if (!oideq(&oids.list[i - 1], &oids.list[i]))
|
||||
count_distinct++;
|
||||
}
|
||||
|
||||
@ -960,7 +960,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g)
|
||||
continue;
|
||||
}
|
||||
|
||||
if (oidcmp(&get_commit_tree_in_graph_one(g, graph_commit)->object.oid,
|
||||
if (!oideq(&get_commit_tree_in_graph_one(g, graph_commit)->object.oid,
|
||||
get_commit_tree_oid(odb_commit)))
|
||||
graph_report("root tree OID for commit %s in commit-graph is %s != %s",
|
||||
oid_to_hex(&cur_oid),
|
||||
@ -977,7 +977,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g)
|
||||
break;
|
||||
}
|
||||
|
||||
if (oidcmp(&graph_parents->item->object.oid, &odb_parents->item->object.oid))
|
||||
if (!oideq(&graph_parents->item->object.oid, &odb_parents->item->object.oid))
|
||||
graph_report("commit-graph parent for %s is %s != %s",
|
||||
oid_to_hex(&cur_oid),
|
||||
oid_to_hex(&graph_parents->item->object.oid),
|
||||
|
Reference in New Issue
Block a user