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

[PATCH 2/2] odb: introduce `odb_prepare()`

From
Patrick Steinhardt <ps@pks.im>
Date
Jun 22, 2026, 08:47 UTC
Message-ID
<20260622-b4-pks-odb-generalize-prepare-v1-2-d2a5c5d13144@pks.im>
In-Reply-To
<20260622-b4-pks-odb-generalize-prepare-v1-0-d2a5c5d13144@pks.im>

Introduce `odb_prepare()` as a simple wrapper to prepare alternates and then prepare each individual source. Adapt git-grep(1) to use it.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 builtin/grep.c |  9 ++-------
 odb.c          | 18 ++++++++++++------
 odb.h          |  8 ++++++--
 3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 7361bf071e..a7252d56a1 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1356,13 +1356,8 @@ int cmd_grep(int argc,
 		if (recurse_submodules)
 			repo_read_gitmodules(the_repository, 1);
 
-		if (startup_info->have_repository) {
-			struct odb_source *source;
-
-			odb_prepare_alternates(the_repository->objects);
-			for (source = the_repository->objects->sources; source; source = source->next)
-				odb_source_prepare(source, 0);
-		}
+		if (startup_info->have_repository)
+			odb_prepare(the_repository->objects, 0);
 
 		start_threads(&opt);
 	} else {
diff --git a/odb.c b/odb.c
index 7b45390e12..11414c49a8 100644
--- a/odb.c
+++ b/odb.c
@@ -1070,7 +1070,7 @@ void odb_free(struct object_database *o)
 	free(o);
 }
 
-void odb_reprepare(struct object_database *o)
+void odb_prepare(struct object_database *o, enum odb_prepare_flags flags)
 {
 	struct odb_source *source;
 
@@ -1082,13 +1082,19 @@ void odb_reprepare(struct object_database *o)
 	 * the linked list, so existing odbs will continue to exist for
 	 * the lifetime of the process.
 	 */
-	o->loaded_alternates = 0;
-	odb_prepare_alternates(o);
+	if (flags & ODB_PREPARE_FLUSH_CACHES) {
+		o->loaded_alternates = 0;
+		o->object_count_valid = 0;
+	}
 
+	odb_prepare_alternates(o);
 	for (source = o->sources; source; source = source->next)
-		odb_source_prepare(source, ODB_PREPARE_FLUSH_CACHES);
-
-	o->object_count_valid = 0;
+		odb_source_prepare(source, flags);
 
 	obj_read_unlock();
 }
+
+void odb_reprepare(struct object_database *o)
+{
+	odb_prepare(o, ODB_PREPARE_FLUSH_CACHES);
+}
diff --git a/odb.h b/odb.h
index c14c9030e4..b1c0f3767b 100644
--- a/odb.h
+++ b/odb.h
@@ -133,9 +133,13 @@ enum odb_prepare_flags {
 };
 
 /*
- * Clear caches, reload alternates and then reload object sources so that new
- * objects may become accessible.
+ * Prepare the object database for use. Calling this function is generally not
+ * needed, but can be useful in case the caller wants to pre-open individual
+ * sources.
  */
+void odb_prepare(struct object_database *o, enum odb_prepare_flags flags);
+
+/* Equivalent to `odb_prepare(o, ODB_PREPARE_FLUSH_CACHES)`. */
 void odb_reprepare(struct object_database *o);
 
 /*
-- 
2.55.0.rc1.745.g43192e7977.dirty
Previous: Toon ClaesNext: Toon Claes
Message 6 of 10 in “odb: generalize `reprepare()` callback”
  1. 0/2 odb: generalize `reprepare()` callbackPatrick Steinhardt, Jun 22, 2026
  2. 1/2 odb/source: generalize `reprepare()` callbackPatrick Steinhardt, Jun 22, 2026
  3. Toon ClaesJun 26, 2026
  4. Patrick SteinhardtJun 29, 2026
  5. Toon ClaesJun 30, 2026
  6. 2/2 odb: introduce `odb_prepare()`Patrick Steinhardt, Jun 22, 2026
  7. Toon ClaesJun 26, 2026
  8. Patrick SteinhardtJun 29, 2026
  9. Junio C HamanoJun 29, 2026
  10. Patrick SteinhardtJun 30, 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.