admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

odb: rename repo_read_object_file()

Browse Source 
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>
This commit is contained in:
Patrick Steinhardt
2025-07-01 14:22:26 +02:00
committed by Junio C Hamano
parent e989dd96b8
commit d4ff88aee3
47 changed files with 157 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
merge-blobs.c
View File

@@ -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)