[PATCH 6/9] object-file: only register submodule ODB if needed
- From
- Jonathan Tan <jonathantanmy@google.com>
- Date
- Sep 21, 2021, 16:51 UTC
- Message-ID
- <a62741e779a7e7bf6c371a1cab4f87821110b947.1632242495.git.jonathantanmy@google.com>
- In-Reply-To
- <cover.1632242495.git.jonathantanmy@google.com>
In a35e03dee0 ("submodule: lazily add submodule ODBs as alternates", 2021-09-08), Git was taught to add all known submodule ODBs as alternates when attempting to read an object that doesn't exist, as a fallback for when a submodule object is read as if it were in the_repository. However, this behavior wasn't restricted to happen only when reading from the_repository. Fix this.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com> --- object-file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/object-file.c b/object-file.c index 621b121bcb..ab861dfdeb 100644 --- a/object-file.c +++ b/object-file.c @@ -1593,7 +1593,8 @@ static int do_oid_object_info_extended(struct repository *r, break; } - if (register_all_submodule_odb_as_alternates()) + if (r == the_repository && + register_all_submodule_odb_as_alternates()) /* We added some alternates; retry */ continue;
-- 2.33.0.464.g1972c5931b-goog