Skip to content

Commit acfeaf8

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

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
@@ -130,6 +130,7 @@ static int add_submodule_odb(const char *path)
130130
goto done;
131131
}
132132
/* avoid adding it twice */
133+
prepare_alt_odb();
133134
for (alt_odb = alt_odb_list; alt_odb; alt_odb = alt_odb->next)
134135
if (alt_odb->name - alt_odb->base == objects_directory.len &&
135136
!strncmp(alt_odb->base, objects_directory.buf,
@@ -148,7 +149,6 @@ static int add_submodule_odb(const char *path)
148149

149150
/* add possible alternates from the submodule */
150151
read_info_alternates(objects_directory.buf, 0);
151-
prepare_alt_odb();
152152
done:
153153
strbuf_release(&objects_directory);
154154
return ret;

0 commit comments

Comments
 (0)