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-ort.c | |
| parent | odb: rename `oid_object_info()` (diff) | |
| download | git-d4ff88aee3967e5d1ef1237cd9b8792b7cdb304c.tar.gz git-d4ff88aee3967e5d1ef1237cd9b8792b7cdb304c.zip | |
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-ort.c')
| -rw-r--r-- | merge-ort.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ort.c b/merge-ort.c index f29417040c..473ff61e36 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -3629,7 +3629,7 @@ static int read_oid_strbuf(struct merge_options *opt, void *buf; enum object_type type; unsigned long size; - buf = repo_read_object_file(the_repository, oid, &type, &size); + buf = odb_read_object(the_repository->objects, oid, &type, &size); if (!buf) { path_msg(opt, ERROR_OBJECT_READ_FAILED, 0, path, NULL, NULL, NULL, |