diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 20:53:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 20:53:57 (GMT) |
| commit | 769af0fd9ea0b4de172b51ae4b9ea41b57c02fd3 (patch) | |
| tree | 524c7d9759fb9deae7b82581aa28fc8bc38265f6 /commit-graph.c | |
| parent | d88949d86eddb62acbc85c16c97587db043d05b1 (diff) | |
| parent | d9f62dfa0ddc31bdad93054acca9fd42ca781f7f (diff) | |
| download | git-769af0fd9ea0b4de172b51ae4b9ea41b57c02fd3.zip git-769af0fd9ea0b4de172b51ae4b9ea41b57c02fd3.tar.gz git-769af0fd9ea0b4de172b51ae4b9ea41b57c02fd3.tar.bz2 | |
Merge branch 'jk/cocci'
spatch transformation to replace boolean uses of !hashcmp() to
newly introduced oideq() is added, and applied, to regain
performance lost due to support of multiple hash algorithms.
* jk/cocci:
show_dirstat: simplify same-content check
read-cache: use oideq() in ce_compare functions
convert hashmap comparison functions to oideq()
convert "hashcmp() != 0" to "!hasheq()"
convert "oidcmp() != 0" to "!oideq()"
convert "hashcmp() == 0" to hasheq()
convert "oidcmp() == 0" to oideq()
introduce hasheq() and oideq()
coccinelle: use <...> for function exclusion
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/commit-graph.c b/commit-graph.c index 0cad55e..ae6cabb 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -783,7 +783,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++; } @@ -797,7 +797,7 @@ void write_commit_graph(const char *obj_dir, num_extra_edges = 0; for (i = 0; i < oids.nr; i++) { int num_parents = 0; - if (i > 0 && !oidcmp(&oids.list[i-1], &oids.list[i])) + if (i > 0 && oideq(&oids.list[i - 1], &oids.list[i])) continue; commits.list[commits.nr] = lookup_commit(the_repository, &oids.list[i]); @@ -918,7 +918,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g) f = hashfd(devnull, NULL); hashwrite(f, g->data, g->data_len - g->hash_len); finalize_hashfile(f, checksum.hash, CSUM_CLOSE); - if (hashcmp(checksum.hash, g->data + g->data_len - g->hash_len)) { + if (!hasheq(checksum.hash, g->data + g->data_len - g->hash_len)) { graph_report(_("the commit-graph file has incorrect checksum and is likely corrupt")); verify_commit_graph_error = VERIFY_COMMIT_GRAPH_ERROR_HASH; } @@ -978,7 +978,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), @@ -995,7 +995,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), |