[PATCH 3/9] commit-graph: drop redundant call to "lite" verification
- From
Jeff King <peff@peff.net>
- Date
- Nov 9, 2023, 07:13 UTC
- Message-ID
- <20231109071312.GC2698043@coredump.intra.peff.net>
- In-Reply-To
- <20231109070310.GA2697602@coredump.intra.peff.net>
The idea of verify_commit_graph_lite() is to have cheap verification checks both for everyday use of the graph files (to avoid out of bounds reads, etc) as well as for doing a full check via "commit-graph verify" (which will also check the hash, etc).
But the expensive verification checks operate on a commit_graph struct, which we get by using the normal everyday-reader code! So any problem we'd find by calling it would have been found before we even got to the verify_one_commit_graph() function.
Removing it simplifies the code a bit, but also frees us up to move the "lite" verification steps around within that everyday-reader code.
Signed-off-by: Jeff King <peff@peff.net> --- commit-graph.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/commit-graph.c b/commit-graph.c index 5d7d7a89e5..d9fc08de86 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -2690,10 +2690,6 @@ static int verify_one_commit_graph(struct repository *r, struct commit *seen_gen_zero = NULL; struct commit *seen_gen_non_zero = NULL; - verify_commit_graph_error = verify_commit_graph_lite(g); - if (verify_commit_graph_error) - return verify_commit_graph_error; - if (!commit_graph_checksum_valid(g)) { graph_report(_("the commit-graph file has incorrect checksum and is likely corrupt")); verify_commit_graph_error = VERIFY_COMMIT_GRAPH_ERROR_HASH;
-- 2.43.0.rc1.572.g273fc7bed6