From: Jonathan Tan Date: Fri, 8 Oct 2021 21:08:18 +0000 (-0700) Subject: object-file: only register submodule ODB if needed X-Git-Tag: v2.34.0-rc0~40^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eef71904ff68e90f2db37aa9e25fe82c3fccf2a0;p=thirdparty%2Fgit.git object-file: only register submodule ODB if needed 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 Signed-off-by: Junio C Hamano --- diff --git a/object-file.c b/object-file.c index be4f94ecf3..0a1835fe30 100644 --- a/object-file.c +++ b/object-file.c @@ -1614,7 +1614,14 @@ static int do_oid_object_info_extended(struct repository *r, break; } - if (register_all_submodule_odb_as_alternates()) + /* + * If r is the_repository, this might be an attempt at + * accessing a submodule object as if it were in the_repository + * (having called add_submodule_odb() on that submodule's ODB). + * If any such ODBs exist, register them and try again. + */ + if (r == the_repository && + register_all_submodule_odb_as_alternates()) /* We added some alternates; retry */ continue;