summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-23 20:35:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-23 20:35:06 (GMT)
commit4809ff858b78c94ada8bd8a61a89ae8d39eda193 (patch)
tree1fef747fa1f6ee157441152a789a9ed472d60405 /submodule.c
parentaa3bb87176d42f1782c5030fa41e6e62492551c0 (diff)
parent5e73633dbf8a62190611f6eb438a1a2eaaffa919 (diff)
downloadgit-4809ff858b78c94ada8bd8a61a89ae8d39eda193.zip
git-4809ff858b78c94ada8bd8a61a89ae8d39eda193.tar.gz
git-4809ff858b78c94ada8bd8a61a89ae8d39eda193.tar.bz2
Merge branch 'hv/submodule-alt-odb'
When peeking into object stores of submodules, the code forgot that they might borrow objects from alternate object stores on their own. By Heiko Voigt * hv/submodule-alt-odb: teach add_submodule_odb() to look for alternates
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 784b580..959d349 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);