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 /sha1_file.c | |
| parent | aa3bb87176d42f1782c5030fa41e6e62492551c0 (diff) | |
| parent | 5e73633dbf8a62190611f6eb438a1a2eaaffa919 (diff) | |
| download | git-4809ff858b78c94ada8bd8a61a89ae8d39eda193.tar.gz | |
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 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c index 3c4f1652f1..4ccaf7ac19 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -229,7 +229,6 @@ char *sha1_pack_index_name(const unsigned char *sha1) struct alternate_object_database *alt_odb_list; static struct alternate_object_database **alt_odb_tail; -static void read_info_alternates(const char * alternates, int depth); static int git_open_noatime(const char *name); /* @@ -354,7 +353,7 @@ static void link_alt_odb_entries(const char *alt, const char *ep, int sep, } } -static void read_info_alternates(const char * relative_base, int depth) +void read_info_alternates(const char * relative_base, int depth) { char *map; size_t mapsz; |