Merge branch 'jk/commit-graph-slab-clear-fix' into maint-2.43

[thirdparty/git.git] / commit-graph.c

diff --git a/commit-graph.c b/commit-graph.c
index ee66098e077d89f293b9527c7689865904f4a12f..f2def8bb49680a0f899b65320d0687369534c88c 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -831,6 +831,9 @@ struct bloom_filter_settings *get_bloom_filter_settings(struct repository *r)
 
 void close_commit_graph(struct raw_object_store *o)
 {
+       if (!o->commit_graph)
+               return;
+
        clear_commit_graph_data_slab(&commit_graph_data_slab);
        free_commit_graph(o->commit_graph);
        o->commit_graph = NULL;
@@ -1029,7 +1032,7 @@ struct commit *lookup_commit_in_graph(struct repository *repo, const struct obje
        uint32_t pos;
 
        if (commit_graph_paranoia == -1)
-               commit_graph_paranoia = git_env_bool(GIT_COMMIT_GRAPH_PARANOIA, 1);
+               commit_graph_paranoia = git_env_bool(GIT_COMMIT_GRAPH_PARANOIA, 0);
 
        if (!prepare_commit_graph(repo))
                return NULL;