diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:32 -0800 |
| commit | 3b2f8a02fa9a9e68d5215828e1d97bb4f6996976 (patch) | |
| tree | 95480e645fe16f17fd9ccc43a893699476b60a63 /http-walker.c | |
| parent | Merge branch 'fc/http-version' (diff) | |
| parent | odb_load_loose_cache: fix strbuf leak (diff) | |
| download | git-3b2f8a02fa9a9e68d5215828e1d97bb4f6996976.tar.gz git-3b2f8a02fa9a9e68d5215828e1d97bb4f6996976.zip | |
Merge branch 'jk/loose-object-cache'
Code clean-up with optimization for the codepath that checks
(non-)existence of loose objects.
* jk/loose-object-cache:
odb_load_loose_cache: fix strbuf leak
fetch-pack: drop custom loose object cache
sha1-file: use loose object cache for quick existence check
object-store: provide helpers for loose_objects_cache
sha1-file: use an object_directory for the main object dir
handle alternates paths the same as the main object dir
sha1_file_name(): overwrite buffer instead of appending
rename "alternate_object_database" to "object_directory"
submodule--helper: prefer strip_suffix() to ends_with()
fsck: do not reuse child_process structs
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 b3334bf657..0a392c85b6 100644 --- a/http-walker.c +++ b/http-walker.c @@ -547,7 +547,7 @@ static int fetch_object(struct walker *walker, unsigned char *sha1) ret = error("File %s has bad hash", hex); } else if (req->rename < 0) { struct strbuf buf = STRBUF_INIT; - sha1_file_name(the_repository, &buf, req->sha1); + loose_object_path(the_repository, &buf, req->sha1); ret = error("unable to write sha1 filename %s", buf.buf); strbuf_release(&buf); } |
