Merge branch 'jt/no-abuse-alternate-odb-for-submodules'
Follow through the work to use the repo interface to access
submodule objects in-process, instead of abusing the alternate
object database interface.
* jt/no-abuse-alternate-odb-for-submodules:
submodule: trace adding submodule ODB as alternate
submodule: pass repo to check_has_commit()
object-file: only register submodule ODB if needed
merge-{ort,recursive}: remove add_submodule_odb()
refs: peeling non-the_repository iterators is BUG
refs: teach arbitrary repo support to iterators
refs: plumb repo into ref stores
This commit is contained in:
@ -1528,7 +1528,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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user