[PATCH v5 2/7] commit-graph: return if there is no git directory
- From
Lessley Dennington via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Dec 3, 2021, 21:16 UTC
- Message-ID
- <9e53a6435e4e7bdde941875fac6742288947b5e0.1638566165.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1050.v5.git.1638566165.gitgitgadget@gmail.com>
From: Lessley Dennington <lessleydennington@gmail.com>
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 <lessleydennington@gmail.com> --- 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