diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-02-24 22:10:37 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-02-24 22:10:37 -0800 |
commit | 117c1b333da05e87a35ea73756518abe52407d84 (patch) | |
tree | 8c7dc4c0fbe9b7d26f2955ee3b95c626f3e1f6cb /http.c | |
parent | 9f8410b941130630db288794c253e697e4515d9d (diff) | |
parent | 8b9c2dd4dee01b5a0a9c5cfdd5a107f78edaceb7 (diff) | |
download | git-117c1b333da05e87a35ea73756518abe52407d84.tar.gz |
Merge branch 'jk/dumb-http-idx-fetch-fix' into maint
A broken pack .idx file in the receiving repository prevented the
dumb http transport from fetching a good copy of it from the other
side.
* jk/dumb-http-idx-fetch-fix:
dumb-http: do not pass NULL path to parse_pack_index
Diffstat (limited to 'http.c')
-rw-r--r-- | http.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1250,7 +1250,7 @@ static int fetch_and_setup_pack_index(struct packed_git **packs_head, int ret; if (has_pack_index(sha1)) { - new_pack = parse_pack_index(sha1, NULL); + new_pack = parse_pack_index(sha1, sha1_pack_index_name(sha1)); if (!new_pack) return -1; /* parse_pack_index() already issued error message */ goto add_pack; |