[PATCH v6 2/7] commit-graph: return if there is no git directory
From: Lessley Dennington via GitGitGadget <hidden>
Date: 2021-12-06 16:10:42
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Lessley Dennington <redacted> Return early if git directory does not exist. This will protect against test failures in the upcoming change to BUG in prepare_repo_settings if no git directory exists. Signed-off-by: Lessley Dennington <redacted> Reviewed-by: Elijah Newren <redacted> --- commit-graph.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/commit-graph.c b/commit-graph.c
index 2706683acfe..265c010122e 100644
--- a/commit-graph.c
+++ b/commit-graph.c@@ -632,10 +632,13 @@ static int prepare_commit_graph(struct repository *r) struct object_directory *odb; /* + * Early return if there is no git dir or if the commit graph is + * disabled. + * * This must come before the "already attempted?" check below, because * we want to disable even an already-loaded graph file. */ - if (r->commit_graph_disabled) + if (!r->gitdir || r->commit_graph_disabled) return 0; if (r->objects->commit_graph_attempted)
--
gitgitgadget