From: Taylor Blau Date: Tue, 06 Aug 2024 15:37:33 GMT Subject: [PATCH v3 08/19] midx: teach `bsearch_midx()` about incremental MIDXs Message-ID: <16db6c98cecb103c9c4aae263dc8b9071be2caea.1722958596.git.me@ttaylorr.com> In-Reply-To: Now that the special cases callers of `bsearch_midx()` have been dealt with, teach `bsearch_midx()` to handle incremental MIDX chains. The incremental MIDX-aware version of `bsearch_midx()` works by repeatedly searching for a given OID in each layer along the `->base_midx` pointer, stopping either when an exact match is found, or the end of the chain is reached. Signed-off-by: Taylor Blau --- midx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/midx.c b/midx.c index bd6e3f26c9..83857cbd1e 100644 --- a/midx.c +++ b/midx.c @@ -344,7 +344,10 @@ int bsearch_one_midx(const struct object_id *oid, struct multi_pack_index *m, int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result) { - return bsearch_one_midx(oid, m, result); + for (; m; m = m->base_midx) + if (bsearch_one_midx(oid, m, result)) + return 1; + return 0; } struct object_id *nth_midxed_object_oid(struct object_id *oid, -- 2.46.0.46.g406f326d27.dirty