mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hv/submodule-alt-odb'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2012-05-23 13:35:05 -07:00
parent aa3bb87176 5e73633dbf
commit 4809ff858b
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sha1_file.c
View File

@ -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;