Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maint

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:
Junio C Hamano 2015-11-05 12:18:14 -08:00
Родитель ace5348dcb 9a6e4f032e
Коммит f97aee1f94
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -129,6 +129,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,
@ -146,7 +147,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;