diff options
| author | Patrick Steinhardt <ps@pks.im> | 2025-07-01 14:22:26 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-01 14:46:38 -0700 |
| commit | d4ff88aee3967e5d1ef1237cd9b8792b7cdb304c (patch) | |
| tree | 0951b639fd3ead92506db2216efb384e12bd6cc0 /merge-blobs.c | |
| parent | e989dd96b8aa9b20b0e23d3fa845d0baba1b454a (diff) | |
odb: rename `repo_read_object_file()`
Rename `repo_read_object_file()` to `odb_read_object()` to match other
functions related to the object database and our modern coding
guidelines.
Introduce a compatibility wrapper so that any in-flight topics will
continue to compile.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-blobs.c')
| -rw-r--r-- | merge-blobs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/merge-blobs.c b/merge-blobs.c index ba8a3fdfd8..6fc2799417 100644 --- a/merge-blobs.c +++ b/merge-blobs.c @@ -12,8 +12,8 @@ static int fill_mmfile_blob(mmfile_t *f, struct blob *obj) unsigned long size; enum object_type type; - buf = repo_read_object_file(the_repository, &obj->object.oid, &type, - &size); + buf = odb_read_object(the_repository->objects, &obj->object.oid, + &type, &size); if (!buf) return -1; if (type != OBJ_BLOB) { @@ -79,8 +79,8 @@ void *merge_blobs(struct index_state *istate, const char *path, return NULL; if (!our) our = their; - return repo_read_object_file(the_repository, &our->object.oid, - &type, size); + return odb_read_object(the_repository->objects, &our->object.oid, + &type, size); } if (fill_mmfile_blob(&f1, our) < 0) |