diff options
| author | Patrick Steinhardt <ps@pks.im> | 2025-04-29 09:52:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-29 10:08:12 -0700 |
| commit | 56ef85e82ffa39ac86db39bc0ac11c67451d0e5b (patch) | |
| tree | 2b6874b1aaeace33a53e1bedf5f4f55c5cd09859 | |
| parent | ddb28da58fd657fa672f4605e50e140ce4c662f8 (diff) | |
| download | git-56ef85e82ffa39ac86db39bc0ac11c67451d0e5b.tar.gz | |
object-store: drop `loose_object_path()`
The function `loose_object_path()` is a trivial wrapper around
`odb_loose_path()`, with the only exception that it always uses the
primary object database of the given repository. This doesn't really add
a ton of value though, so let's drop the function and inline it at every
callsite.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | http-walker.c | 3 | ||||
| -rw-r--r-- | http.c | 4 | ||||
| -rw-r--r-- | object-file.c | 4 | ||||
| -rw-r--r-- | object-file.h | 4 | ||||
| -rw-r--r-- | object-store.c | 6 | ||||
| -rw-r--r-- | object-store.h | 7 |
6 files changed, 10 insertions, 18 deletions
diff --git a/http-walker.c b/http-walker.c index 882cae19c2..95458e2f63 100644 --- a/http-walker.c +++ b/http-walker.c @@ -9,6 +9,7 @@ #include "list.h" #include "transport.h" #include "packfile.h" +#include "object-file.h" #include "object-store.h" struct alt_base { @@ -540,7 +541,7 @@ static int fetch_object(struct walker *walker, const struct object_id *oid) ret = error("File %s has bad hash", hex); } else if (req->rename < 0) { struct strbuf buf = STRBUF_INIT; - loose_object_path(the_repository, &buf, &req->oid); + odb_loose_path(the_repository->objects->odb, &buf, &req->oid); ret = error("unable to write sha1 filename %s", buf.buf); strbuf_release(&buf); } @@ -2662,7 +2662,7 @@ struct http_object_request *new_http_object_request(const char *base_url, oidcpy(&freq->oid, oid); freq->localfile = -1; - loose_object_path(the_repository, &filename, oid); + odb_loose_path(the_repository->objects->odb, &filename, oid); strbuf_addf(&freq->tmpfile, "%s.temp", filename.buf); strbuf_addf(&prevfile, "%s.prev", filename.buf); @@ -2814,7 +2814,7 @@ int finish_http_object_request(struct http_object_request *freq) unlink_or_warn(freq->tmpfile.buf); return -1; } - loose_object_path(the_repository, &filename, &freq->oid); + odb_loose_path(the_repository->objects->odb, &filename, &freq->oid); freq->rename = finalize_object_file(freq->tmpfile.buf, filename.buf); strbuf_release(&filename); diff --git a/object-file.c b/object-file.c index 9cc3a24a40..dc56a4766d 100644 --- a/object-file.c +++ b/object-file.c @@ -932,7 +932,7 @@ static int write_loose_object(const struct object_id *oid, char *hdr, if (batch_fsync_enabled(FSYNC_COMPONENT_LOOSE_OBJECT)) prepare_loose_object_bulk_checkin(); - loose_object_path(the_repository, &filename, oid); + odb_loose_path(the_repository->objects->odb, &filename, oid); fd = start_loose_object_common(&tmp_file, filename.buf, flags, &stream, compressed, sizeof(compressed), @@ -1079,7 +1079,7 @@ int stream_loose_object(struct input_stream *in_stream, size_t len, goto cleanup; } - loose_object_path(the_repository, &filename, oid); + odb_loose_path(the_repository->objects->odb, &filename, oid); /* We finally know the object path, and create the missing dir. */ dirlen = directory_size(filename.buf); diff --git a/object-file.h b/object-file.h index c002fbe234..0a7b6b9f9d 100644 --- a/object-file.h +++ b/object-file.h @@ -25,6 +25,10 @@ int index_path(struct index_state *istate, struct object_id *oid, const char *pa struct object_directory; +/* + * Put in `buf` the name of the file in the local object database that + * would be used to store a loose object with the specified oid. + */ const char *odb_loose_path(struct object_directory *odb, struct strbuf *buf, const struct object_id *oid); diff --git a/object-store.c b/object-store.c index 6ab50d25d3..e5cfb8c007 100644 --- a/object-store.c +++ b/object-store.c @@ -96,12 +96,6 @@ int odb_pack_keep(const char *name) return open(name, O_RDWR|O_CREAT|O_EXCL, 0600); } -const char *loose_object_path(struct repository *r, struct strbuf *buf, - const struct object_id *oid) -{ - return odb_loose_path(r->objects->odb, buf, oid); -} - /* * Return non-zero iff the path is usable as an alternate object database. */ diff --git a/object-store.h b/object-store.h index e04469a85f..5668de62d0 100644 --- a/object-store.h +++ b/object-store.h @@ -196,13 +196,6 @@ int odb_mkstemp(struct strbuf *temp_filename, const char *pattern); */ int odb_pack_keep(const char *name); -/* - * Put in `buf` the name of the file in the local object database that - * would be used to store a loose object with the specified oid. - */ -const char *loose_object_path(struct repository *r, struct strbuf *buf, - const struct object_id *oid); - void *map_loose_object(struct repository *r, const struct object_id *oid, unsigned long *size); |