From: Patrick Steinhardt Date: Mon, 22 Jun 2026 08:49:29 GMT Subject: [PATCH 3/3] connected: search promisor objects generically Message-ID: <20260622-pks-connected-generic-promisor-checks-v1-3-25eba2698202@pks.im> In-Reply-To: <20260622-pks-connected-generic-promisor-checks-v1-0-25eba2698202@pks.im> When performing connectivity checks we have to figure out whether any of the new objects are promisor objects, as we cannot assume full connectivity if so. This check is performed by iterating through all packfiles in the repository and searching each of them for the given object. Of course, this mechanism is quite specific to implementation details of the object database, as we assume that it uses packfiles in the first place. Refactor the logic so that we instead use `odb_for_each_object_ext()` with an object prefix filter and the `ODB_FOR_EACH_OBJECT_PROMISOR_ONLY` flag. This will yield all objects that have the exact object name and that are part of a promisor pack in a generic way. Signed-off-by: Patrick Steinhardt --- connected.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/connected.c b/connected.c index 7e26976832..9a666f0cdf 100644 --- a/connected.c +++ b/connected.c @@ -11,6 +11,13 @@ #include "packfile.h" #include "promisor-remote.h" +static int promised_object_cb(const struct object_id *oid UNUSED, + struct object_info *oi UNUSED, + void *payload UNUSED) +{ + return 1; +} + /* * If we feed all the commits we want to verify to this command * @@ -46,6 +53,11 @@ int check_connected(oid_iterate_fn fn, void *cb_data, } if (repo_has_promisor_remote(the_repository)) { + struct odb_for_each_object_options opts = { + .flags = ODB_FOR_EACH_OBJECT_PROMISOR_ONLY, + .prefix_hex_len = the_repository->hash_algo->hexsz, + }; + /* * For partial clones, we don't want to have to do a regular * connectivity check because we have to enumerate and exclude @@ -54,31 +66,30 @@ int check_connected(oid_iterate_fn fn, void *cb_data, * object is a promisor object. Instead, just make sure we * received, in a promisor packfile, the objects pointed to by * each wanted ref. - * - * Before checking for promisor packs, be sure we have the - * latest pack-files loaded into memory. */ - odb_reprepare(the_repository->objects); do { - struct packed_git *p; - - repo_for_each_pack(the_repository, p) { - if (!p->pack_promisor) - continue; - if (find_pack_entry_one(oid, p)) - goto promisor_pack_found; + opts.prefix = oid; + + err = odb_for_each_object_ext(the_repository->objects, + NULL, promised_object_cb, + NULL, &opts); + if (err < 0) + break; + if (err > 0) { + err = 0; + continue; } + /* * Fallback to rev-list with oid and the rest of the * object IDs provided by fn. */ goto no_promisor_pack_found; -promisor_pack_found: - ; } while ((oid = fn(cb_data)) != NULL); + if (opt->err_fd) close(opt->err_fd); - return 0; + return err; } no_promisor_pack_found: -- 2.55.0.rc1.745.g43192e7977.dirty