aboutsummaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2025-07-01 14:22:25 +0200
committerJunio C Hamano <gitster@pobox.com>2025-07-01 14:46:37 -0700
commite989dd96b8aa9b20b0e23d3fa845d0baba1b454a (patch)
tree8f205f5e7ec243777ec9ca46069575cf77164ecf /sequencer.c
parent16cf7494962f20d09dcd8ef20af8962600fafca9 (diff)
downloadgit-e989dd96b8aa9b20b0e23d3fa845d0baba1b454a.tar.xz
odb: rename `oid_object_info()`
Rename `oid_object_info()` to `odb_read_object_info()` as well as their `_extended()` variant to match other functions related to the object database and our modern coding guidelines. Introduce compatibility wrappers 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 'sequencer.c')
-rw-r--r--sequencer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c
index 2432d0a39e..193459405f 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -5503,9 +5503,8 @@ int sequencer_pick_revisions(struct repository *r,
if (!repo_get_oid(r, name, &oid)) {
if (!lookup_commit_reference_gently(r, &oid, 1)) {
- enum object_type type = oid_object_info(r,
- &oid,
- NULL);
+ enum object_type type = odb_read_object_info(r->objects,
+ &oid, NULL);
res = error(_("%s: can't cherry-pick a %s"),
name, type_name(type));
goto out;