diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-23 13:35:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-23 13:35:06 -0700 |
| commit | 4809ff858b78c94ada8bd8a61a89ae8d39eda193 (patch) | |
| tree | 1fef747fa1f6ee157441152a789a9ed472d60405 /submodule.c | |
| parent | remote: fix typo (diff) | |
| parent | teach add_submodule_odb() to look for alternates (diff) | |
| download | tgif-4809ff858b78c94ada8bd8a61a89ae8d39eda193.tar.xz | |
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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/submodule.c b/submodule.c index 784b58039d..959d349ea7 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); |