git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 6/8] setup: stop initializing object database without repository

From
Patrick Steinhardt <ps@pks.im>
Date
Jun 4, 2026, 07:46 UTC
Message-ID
<20260604-b4-pks-setup-centralize-odb-creation-v3-6-0691834f318a@pks.im>
In-Reply-To
<20260604-b4-pks-setup-centralize-odb-creation-v3-0-0691834f318a@pks.im>

The function `setup_git_directory_gently()` is responsible for discovering and setting up a Git repository based on various environment variables and the current working directory. The result is thus a fully usable Git repository.

One oddity of this function is that we may set up the object database even in the case where we don't have a repository, namely in the case where the `GIT_DIR_EXPLICIT` environment variable is set but points to a non-existent repository. If so, we call `setup_git_env_internal()` with the value of the environment variable so that the repository's Git directory is configured, even if it points to a non-existent directory.

Historically though, this function didn't only configure the repository, but also initialized the object database. We retained this behaviour from a preceding commit, even though it really doesn't make much sense in the first place -- there is no repository, so we don't have an object database either. There seemingly isn't much of a reason to construct the object database, as we typically won't try to read objects when we don't have an object database.

There's one exception though: git-index-pack(1) may run outside of a repository, which can be used to perform consistency checks for a packfile. The code path is _almost_ working: we already know to call `parse_object_buffer()`, which can read objects without an object database being available. And that works for all object types except for commits, because `parse_commit_buffer()` calls `parse_commit_graph()`, and that function doesn't handle the case where we don't have an object database.

Fix this instance to check for the object database instead of checking for the Git directory having been initialized. With this fixed, we can now stop constructing an object database completely.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 commit-graph.c | 4 ++--
 setup.c        | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/commit-graph.c b/commit-graph.c
index 9abe62bd5a..0820cf5fb8 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -740,13 +740,13 @@ static struct commit_graph *prepare_commit_graph(struct repository *r)
 	struct odb_source *source;
 
 	/*
-	 * Early return if there is no git dir or if the commit graph is
+	 * Early return if there is no object database 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->gitdir || r->commit_graph_disabled)
+	if (!r->objects || r->commit_graph_disabled)
 		return NULL;
 
 	if (r->objects->commit_graph_attempted)
diff --git a/setup.c b/setup.c
index 0dc9fe4565..4a8d6230b1 100644
--- a/setup.c
+++ b/setup.c
@@ -2043,13 +2043,12 @@ const char *setup_git_directory_gently(struct repository *repo, int *nongit_ok)
 			setup_git_env_internal(repo, gitdir);
 		}
 
-		repo->objects = odb_new(repo,
-					getenv_safe(&to_free, DB_ENVIRONMENT),
-					getenv_safe(&to_free, ALTERNATE_DB_ENVIRONMENT));
-
 		if (startup_info->have_repository) {
 			struct strbuf err = STRBUF_INIT;
 
+			repo->objects = odb_new(repo,
+						getenv_safe(&to_free, DB_ENVIRONMENT),
+						getenv_safe(&to_free, ALTERNATE_DB_ENVIRONMENT));
 			if (apply_repository_format(repo, &repo_fmt, &err) < 0)
 				die("%s", err.buf);
 
-- 
2.54.0.1064.gd145956f57.dirty
Previous: Patrick SteinhardtNext: Patrick Steinhardt
Message 24 of 28 in “setup: centralize object database creation”
  1. 0/8 setup: centralize object database creationPatrick Steinhardt, May 21, 2026
  2. 1/8 t0001: plug test gaps for git-init(1) with GIT_OBJECT_DIRECTORYPatrick Steinhardt, May 21, 2026
  3. Junio C HamanoMay 21, 2026
  4. Kristoffer HaugsbakkMay 21, 2026
  5. Patrick SteinhardtMay 22, 2026
  6. Kristoffer HaugsbakkMay 22, 2026
  7. 2/8 setup: drop `setup_git_env()`Patrick Steinhardt, May 21, 2026
  8. 3/8 setup: deduplicate logic to apply repository formatPatrick Steinhardt, May 21, 2026
  9. 4/8 repository: stop initializing the object database in `repo_set_gitdir()`Patrick Steinhardt, May 21, 2026
  10. 5/8 setup: stop creating the object database in `setup_git_env()`Patrick Steinhardt, May 21, 2026
  11. 6/8 setup: stop initializing object database without repositoryPatrick Steinhardt, May 21, 2026
  12. 7/8 repository: stop reading loose object map twice on repo initPatrick Steinhardt, May 21, 2026
  13. 8/8 setup: construct object database in `apply_repository_format()`Patrick Steinhardt, May 21, 2026
  14. Junio C HamanoMay 21, 2026
  15. Patrick SteinhardtMay 22, 2026
  16. Junio C HamanoMay 22, 2026
  17. Patrick SteinhardtMay 22, 2026
  18. 0/8 setup: centralize object database creationPatrick Steinhardt, Jun 4, 2026
  19. 1/8 t0001: plug test gaps for git-init(1) with GIT_OBJECT_DIRECTORYPatrick Steinhardt, Jun 4, 2026
  20. 2/8 setup: drop `setup_git_env()`Patrick Steinhardt, Jun 4, 2026
  21. 3/8 setup: deduplicate logic to apply repository formatPatrick Steinhardt, Jun 4, 2026
  22. 4/8 repository: stop initializing the object database in `repo_set_gitdir()`Patrick Steinhardt, Jun 4, 2026
  23. 5/8 setup: stop creating the object database in `setup_git_env()`Patrick Steinhardt, Jun 4, 2026
  24. 6/8 setup: stop initializing object database without repositoryPatrick Steinhardt, Jun 4, 2026
  25. 7/8 repository: stop reading loose object map twice on repo initPatrick Steinhardt, Jun 4, 2026
  26. 8/8 setup: construct object database in `apply_repository_format()`Patrick Steinhardt, Jun 4, 2026
  27. Karthik NayakJun 5, 2026
  28. Junio C HamanoJun 8, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.