diff options
| -rw-r--r-- | cache.h | 2 | ||||
| -rw-r--r-- | http.c | 2 | ||||
| -rw-r--r-- | sha1_file.c | 3 |
3 files changed, 3 insertions, 4 deletions
@@ -900,7 +900,7 @@ struct extra_have_objects { extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, unsigned int flags, struct extra_have_objects *); extern int server_supports(const char *feature); -extern struct packed_git *parse_pack_index(unsigned char *sha1); +extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path); extern void prepare_packed_git(void); extern void reprepare_packed_git(void); @@ -932,7 +932,7 @@ static int fetch_and_setup_pack_index(struct packed_git **packs_head, if (fetch_pack_index(sha1, base_url)) return -1; - new_pack = parse_pack_index(sha1); + new_pack = parse_pack_index(sha1, sha1_pack_index_name(sha1)); if (!new_pack) return -1; /* parse_pack_index() already issued error message */ new_pack->next = *packs_head; diff --git a/sha1_file.c b/sha1_file.c index 4e82654d7c..9f3f514e71 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -845,9 +845,8 @@ struct packed_git *add_packed_git(const char *path, int path_len, int local) return p; } -struct packed_git *parse_pack_index(unsigned char *sha1) +struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path) { - const char *idx_path = sha1_pack_index_name(sha1); const char *path = sha1_pack_name(sha1); struct packed_git *p = alloc_packed_git(strlen(path) + 1); |