midx: teach `bsearch_midx()` about incremental MIDXs
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 <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Taylor Blau committed
Aug 6, 2024 at 11:37 UTC
88f309e095d084d730f908fe1ec01a92c63612c2
1 file changed
+4
-1
midx.c
+4
-1
@@ -344,7 +344,10 @@ int bsearch_one_midx(const struct object_id *oid, struct multi_pack_index *m,
344
int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m,
345
uint32_t *result)
346
{
347
- return bsearch_one_midx(oid, m, result);
347
+ for (; m; m = m->base_midx)
348
+ if (bsearch_one_midx(oid, m, result))
349
+ return 1;
350
+ return 0;
351
}
352
353
struct object_id *nth_midxed_object_oid(struct object_id *oid,