Skip to content

Commit f97aee1

Browse files
committed
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
2 parents ace5348 + 9a6e4f0 commit f97aee1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

submodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ static int add_submodule_odb(const char *path)
129129
goto done;
130130
}
131131
/* avoid adding it twice */
132+
prepare_alt_odb();
132133
for (alt_odb = alt_odb_list; alt_odb; alt_odb = alt_odb->next)
133134
if (alt_odb->name - alt_odb->base == objects_directory.len &&
134135
!strncmp(alt_odb->base, objects_directory.buf,
@@ -146,7 +147,6 @@ static int add_submodule_odb(const char *path)
146147

147148
/* add possible alternates from the submodule */
148149
read_info_alternates(objects_directory.buf, 0);
149-
prepare_alt_odb();
150150
done:
151151
strbuf_release(&objects_directory);
152152
return ret;

0 commit comments

Comments
 (0)