summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorHeiko Voigt <hvoigt@hvoigt.net>2012-05-14 18:24:45 +0200
committerJunio C Hamano <gitster@pobox.com>2012-05-14 11:56:42 -0700
commit5e73633dbf8a62190611f6eb438a1a2eaaffa919 (patch)
tree3b4d75ea58902847c8313ef9abdb5c64fea8d09a /submodule.c
parentd0f1ea6003d97e63110fa7d50bb07f546a909b6e (diff)
downloadgit-5e73633dbf8a62190611f6eb438a1a2eaaffa919.tar.gz
teach add_submodule_odb() to look for alternates
Since we allow to link other object databases when loading a submodules database we should also load possible alternates. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
-rw-r--r--submodule.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/submodule.c b/submodule.c
index 9a28060679..b63978a161 100644
--- a/submodule.c
+++ b/submodule.c
@@ -63,6 +63,9 @@ static int add_submodule_odb(const char *path)
alt_odb->name[40] = '\0';
alt_odb->name[41] = '\0';
alt_odb_list = alt_odb;
+
+ /* add possible alternates from the submodule */
+ read_info_alternates(objects_directory.buf, 0);
prepare_alt_odb();
done:
strbuf_release(&objects_directory);