diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-11-08 05:03:59 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-11-08 05:03:59 +0300 |
commit | 42b87f7ee60323f2e45a91233db80d44d3e33ad2 (patch) | |
tree | f9d4dea38078ea4071e85adabdcd19f5c5840adf /commit-graph.c | |
parent | 234037dbec13b5c94c014b9c46042252dff8bef7 (diff) | |
parent | 7a5d604443ffc7afcd3788818f8fe00fc68c054d (diff) |
Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence'
The codepath to traverse the commit-graph learned to notice that a
commit is missing (e.g., corrupt repository lost an object), even
though it knows something about the commit (like its parents) from
what is in commit-graph.
* ps/do-not-trust-commit-graph-blindly-for-existence:
commit: detect commits that exist in commit-graph but not in the ODB
commit-graph: introduce envvar to disable commit existence checks
Diffstat (limited to 'commit-graph.c')
-rw-r--r-- | commit-graph.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/commit-graph.c b/commit-graph.c index c2b782af3b..ee66098e07 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1024,14 +1024,18 @@ int repo_find_commit_pos_in_graph(struct repository *r, struct commit *c, struct commit *lookup_commit_in_graph(struct repository *repo, const struct object_id *id) { + static int commit_graph_paranoia = -1; struct commit *commit; uint32_t pos; + if (commit_graph_paranoia == -1) + commit_graph_paranoia = git_env_bool(GIT_COMMIT_GRAPH_PARANOIA, 1); + if (!prepare_commit_graph(repo)) return NULL; if (!search_commit_pos_in_graph(id, repo->objects->commit_graph, &pos)) return NULL; - if (!has_object(repo, id, 0)) + if (commit_graph_paranoia && !has_object(repo, id, 0)) return NULL; commit = lookup_commit(repo, id); |