diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-09 08:29:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-09 08:29:08 -0700 |
| commit | db0583b3fd18596b8e360b0fd1554ac3e5c15793 (patch) | |
| tree | 8c862bb8c3ffabeeb92ed88ecd3dd182dbd95f73 /sequencer.c | |
| parent | The eighth batch (diff) | |
| parent | odb: rename `read_object_with_reference()` (diff) | |
| download | git-db0583b3fd18596b8e360b0fd1554ac3e5c15793.tar.gz git-db0583b3fd18596b8e360b0fd1554ac3e5c15793.zip | |
Merge branch 'ps/object-store' into ps/object-store-midx
* ps/object-store:
odb: rename `read_object_with_reference()`
odb: rename `pretend_object_file()`
odb: rename `has_object()`
odb: rename `repo_read_object_file()`
odb: rename `oid_object_info()`
odb: trivial refactorings to get rid of `the_repository`
odb: get rid of `the_repository` when handling submodule sources
odb: get rid of `the_repository` when handling the primary source
odb: get rid of `the_repository` in `for_each()` functions
odb: get rid of `the_repository` when handling alternates
odb: get rid of `the_repository` in `odb_mkstemp()`
odb: get rid of `the_repository` in `assert_oid_type()`
odb: get rid of `the_repository` in `find_odb()`
odb: introduce parent pointers
object-store: rename files to "odb.{c,h}"
object-store: rename `object_directory` to `odb_source`
object-store: rename `raw_object_store` to `object_database`
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sequencer.c b/sequencer.c index 9456ca6ee9..67e4310edc 100644 --- a/sequencer.c +++ b/sequencer.c @@ -13,7 +13,7 @@ #include "dir.h" #include "object-file.h" #include "object-name.h" -#include "object-store.h" +#include "odb.h" #include "object.h" #include "pager.h" #include "commit.h" @@ -5505,9 +5505,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; |