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 /builtin/merge-tree.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 'builtin/merge-tree.c')
| -rw-r--r-- | builtin/merge-tree.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index b1a17787bc..cf8b06cadc 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -75,9 +75,9 @@ static void *result(struct merge_list *entry, unsigned long *size) const char *path = entry->path; if (!entry->stage) - return repo_read_object_file(the_repository, - &entry->blob->object.oid, &type, - size); + return odb_read_object(the_repository->objects, + &entry->blob->object.oid, &type, + size); base = NULL; if (entry->stage == 1) { base = entry->blob; @@ -100,9 +100,9 @@ static void *origin(struct merge_list *entry, unsigned long *size) enum object_type type; while (entry) { if (entry->stage == 2) - return repo_read_object_file(the_repository, - &entry->blob->object.oid, - &type, size); + return odb_read_object(the_repository->objects, + &entry->blob->object.oid, + &type, size); entry = entry->link; } return NULL; |