summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-17 10:15:24 -0800
committerJunio C Hamano <gitster@pobox.com>2015-02-17 10:15:25 -0800
commitb93b5b21b5358c1e5afc7d7d6e8ebf0ba345d98b (patch)
tree51cf395ef49683cd5196711031496157bd2145cc /http.c
parentd7c8b33a35ad4f081dfcf231ea7dabf4ed88c889 (diff)
parent8b9c2dd4dee01b5a0a9c5cfdd5a107f78edaceb7 (diff)
downloadgit-b93b5b21b5358c1e5afc7d7d6e8ebf0ba345d98b.tar.gz
Merge branch 'jk/dumb-http-idx-fetch-fix'
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/http.c b/http.c
index 4ecf9e8f7b..2cdf67d830 100644
--- a/http.c
+++ b/http.c
@@ -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;