[PATCH v6 2/7] commit-graph: return if there is no git directory

From

Lessley Dennington via GitGitGadget <gitgitgadget@gmail.com>

Date

Dec 6, 2021, 15:55 UTC

Message-ID

<f676f03ccb024b9011eff999b342f96cfb76b892.1638806161.git.gitgitgadget@gmail.com>

In-Reply-To

<pull.1050.v6.git.1638806161.gitgitgadget@gmail.com>

From: Lessley Dennington <lessleydennington@gmail.com>

Signed-off-by: Lessley Dennington <lessleydennington@gmail.com>
Reviewed-by: Elijah Newren <newren@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