[PATCH v3 4/5] odb: drop `loaded_alternates` field
From: Patrick Steinhardt <hidden>
Date: 2026-08-17 11:09:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
The `struct object_database::loaded_alternates` field tells us whether or not alternates have been loaded already. This field was useful before the preceding commit as we were indeed lazy-loading alternates. But now that we started to eagerly load them we can assume them to be loaded after `odb_new()`, and hence the field does not serve any purpose anymore. Remove it. Signed-off-by: Patrick Steinhardt <redacted> --- odb.c | 9 +-------- odb.h | 2 -- 2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/odb.c b/odb.c
index d4917c3678..ada42f864b 100644
--- a/odb.c
+++ b/odb.c@@ -245,8 +245,7 @@ void odb_add_to_alternates_file(struct object_database *odb, int ret = odb_source_write_alternate(odb->sources, dir); if (ret < 0) die(NULL); - if (odb->loaded_alternates) - odb_add_alternate_recursively(odb, dir, 0); + odb_add_alternate_recursively(odb, dir, 0); } struct odb_source *odb_add_to_alternates_memory(struct object_database *odb,
@@ -510,16 +509,11 @@ static void odb_prepare_alternates(struct object_database *odb) { struct strvec sources = STRVEC_INIT; - if (odb->loaded_alternates) - return; - parse_alternates(odb->alternate_db, PATH_SEP, NULL, &sources); odb_source_read_alternates(odb->sources, &sources); for (size_t i = 0; i < sources.nr; i++) odb_add_alternate_recursively(odb, sources.v[i], 0); - odb->loaded_alternates = 1; - strvec_clear(&sources); }
@@ -1147,7 +1141,6 @@ void odb_prepare(struct object_database *o, enum odb_prepare_flags flags) * the lifetime of the process. */ if (flags & ODB_PREPARE_FLUSH_CACHES) { - o->loaded_alternates = 0; odb_prepare_alternates(o); o->object_count_valid = 0; }
diff --git a/odb.h b/odb.h
index fbafee174b..aefb34213f 100644
--- a/odb.h
+++ b/odb.h@@ -69,8 +69,6 @@ struct object_database { */ int source_paths_icase; - int loaded_alternates; - /* * A list of alternate object directories loaded from the environment; * this should not generally need to be accessed directly, but will
--
2.55.0.822.g20453c30eb.dirty