diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:19 -0700 |
| commit | 035bf8d7c484b82e3e278af8c91584ae724cb5d4 (patch) | |
| tree | 7f8c1620675798675f50f3d25af0cd1f27e161a3 /http-walker.c | |
| parent | 465ef577b59986d70c51ea72dd3f87759b2bcd4f (diff) | |
| parent | 90d05713575ea6ed21d05228bcda8461f7b28ccf (diff) | |
| download | git-035bf8d7c484b82e3e278af8c91584ae724cb5d4.tar.gz | |
Merge branch 'sp/maint-dumb-http-pack-reidx'
* sp/maint-dumb-http-pack-reidx:
http.c::new_http_pack_request: do away with the temp variable filename
http-fetch: Use temporary files for pack-*.idx until verified
http-fetch: Use index-pack rather than verify-pack to check packs
Allow parse_pack_index on temporary files
Extract verify_pack_index for reuse from verify_pack
Introduce close_pack_index to permit replacement
http.c: Remove unnecessary strdup of sha1_to_hex result
http.c: Don't store destination name in request structures
http.c: Drop useless != NULL test in finish_http_pack_request
http.c: Tiny refactoring of finish_http_pack_request
t5550-http-fetch: Use subshell for repository operations
http.c: Remove bad free of static block
Diffstat (limited to 'http-walker.c')
| -rw-r--r-- | http-walker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/http-walker.c b/http-walker.c index ef99ae647a..8ca76d0507 100644 --- a/http-walker.c +++ b/http-walker.c @@ -510,7 +510,7 @@ static int fetch_object(struct walker *walker, struct alt_base *repo, unsigned c ret = error("File %s has bad hash", hex); } else if (req->rename < 0) { ret = error("unable to write sha1 filename %s", - req->filename); + sha1_file_name(req->sha1)); } release_http_object_request(req); |