mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
Merge branch 'jk/initialization-fix-to-add-submodule-odb'
We peek objects from submodule's object store by linking it to the list of alternate object databases, but the code to do so forgot to correctly initialize the list. * jk/initialization-fix-to-add-submodule-odb: add_submodule_odb: initialize alt_odb list earlier
This commit is contained in:
commit
acfeaf8c96
|
@ -130,6 +130,7 @@ static int add_submodule_odb(const char *path)
|
|||
goto done;
|
||||
}
|
||||
/* avoid adding it twice */
|
||||
prepare_alt_odb();
|
||||
for (alt_odb = alt_odb_list; alt_odb; alt_odb = alt_odb->next)
|
||||
if (alt_odb->name - alt_odb->base == objects_directory.len &&
|
||||
!strncmp(alt_odb->base, objects_directory.buf,
|
||||
|
@ -148,7 +149,6 @@ static int add_submodule_odb(const char *path)
|
|||
|
||||
/* add possible alternates from the submodule */
|
||||
read_info_alternates(objects_directory.buf, 0);
|
||||
prepare_alt_odb();
|
||||
done:
|
||||
strbuf_release(&objects_directory);
|
||||
return ret;
|
||||
|
|
Loading…
Reference in a new issue