Re: [PATCH 07/14] object-name: backend-generic `repo_collect_ambiguous()`
- From
Karthik Nayak <karthik.188@gmail.com>
- Date
- Mar 20, 2026, 09:23 UTC
- Message-ID
- <CAOLa=ZSC=uTPg516dGSEnRcWgr4J9iDBQ+8D=o0F+jT1jkK-sA@mail.gmail.com>
- In-Reply-To
- <20260319-b4-pks-odb-source-abbrev-v1-7-5ddebad292b0@pks.im>
Patrick Steinhardt <ps@pks.im> writes:
Show 33 quoted lines
> The function `repo_collect_ambiguous()` is responsible for collecting > objects whose IDs match a specific prefix. The information is then > used to inform the user about which objects they could have meant in > case a short object ID is ambiguous. > > The logic to do this uses the object disambiguation infrastructure and > calls into backend-specific functions to iterate through loose and > packed objects. This isn't really required anymore though: all we want > to do is to enumerate objects that have such a prefix and then append > those objects to a `struct oid_array`. This can be trivially achieved > in a generic way now that `odb_for_each_object()` has learned to yield > only objects that much such a prefix. > > Refactor the code to use the backend-generic infrastructure instead. > > Signed-off-by: Patrick Steinhardt <ps@pks.im> > --- > object-name.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/object-name.c b/object-name.c > index fd1b010ab3..4c3ace150e 100644 > --- a/object-name.c > +++ b/object-name.c > @@ -448,8 +448,8 @@ static int collect_ambiguous(const struct object_id *oid, void *data) > return 0; > } > > -static int repo_collect_ambiguous(struct repository *r UNUSED, > - const struct object_id *oid, > +static int repo_collect_ambiguous(const struct object_id *oid, > + struct object_info *oi UNUSED, > void *data)
So these modifications are so that it matches the callback function type.
Show 27 quoted lines
> {
> return collect_ambiguous(oid, data);
> @@ -586,18 +586,19 @@ int repo_for_each_abbrev(struct repository *r, const char *prefix,
> const struct git_hash_algo *algo,
> each_abbrev_fn fn, void *cb_data)
> {
> + struct object_id prefix_oid = { 0 };
> + struct odb_for_each_object_options opts = {
> + .prefix = &prefix_oid,
> + .prefix_hex_len = strlen(prefix),
> + };
> struct oid_array collect = OID_ARRAY_INIT;
> - struct disambiguate_state ds;
> int ret;
>
> - if (init_object_disambiguation(r, prefix, strlen(prefix), algo, &ds) < 0)
> + if (parse_oid_prefix(prefix, opts.prefix_hex_len, algo, NULL, &prefix_oid) < 0)
> return -1;
>
> - ds.always_call_fn = 1;
> - ds.fn = repo_collect_ambiguous;
> - ds.cb_data = &collect;
> - find_short_object_filename(&ds);
> - find_short_packed_object(&ds);
> + if (odb_for_each_object_ext(r->objects, NULL, repo_collect_ambiguous, &collect, &opts) < 0)
> + return -1;
>And finally we simply call the generic `odb_for_each_object_ext()` with the prefix options set.
Show 5 quoted lines
> ret = oid_array_for_each_unique(&collect, fn, cb_data); > oid_array_clear(&collect); > > -- > 2.53.0.1055.ga2ffed1127.dirty