From: Patrick Steinhardt Date: Thu, 26 Mar 2026 12:21:03 GMT Subject: Re: [PATCH 07/16] promisor-remote: keep accepted promisor_info structs alive Message-ID: In-Reply-To: <20260323080520.887550-8-christian.couder@gmail.com> On Mon, Mar 23, 2026 at 09:05:10AM +0100, Christian Couder wrote: > diff --git a/promisor-remote.c b/promisor-remote.c > index 3116d14d14..34b4ca5806 100644 > --- a/promisor-remote.c > +++ b/promisor-remote.c > @@ -912,17 +912,10 @@ static void filter_promisor_remote(struct repository *repo, > if (promisor_store_advertised_fields(advertised, store_info)) > reload_config = true; > > - strvec_push(accepted, advertised->name); Okay, here we used to store the name of the accepted remote... > - /* Capture advertised filters for accepted remotes */ > - if (advertised->filter) { > - struct string_list_item *i; > - i = string_list_append(&accepted_filters, advertised->name); > - i->util = xstrdup(advertised->filter); > - } ... and here we used to store the filter, if any. > + string_list_append(&accepted_remotes, advertised->name)->util = advertised; Instead, we now store the whole remote, ... > + } else { > + promisor_info_free(advertised); ... unless we don't want to accept it, in which case we free it now. Makes sense. > @@ -932,24 +925,23 @@ static void filter_promisor_remote(struct repository *repo, > if (reload_config) > repo_promisor_remote_reinit(repo); > > - /* Apply accepted remote filters to the stable repo state */ > - for_each_string_list_item(item, &accepted_filters) { > - struct promisor_remote *r = repo_promisor_remote_find(repo, item->string); > - if (r) { > - free(r->advertised_filter); > - r->advertised_filter = item->util; > - item->util = NULL; > - } > - } > + /* Apply accepted remotes to the stable repo state */ > + for_each_string_list_item(item, &accepted_remotes) { > + struct promisor_info *info = item->util; > + struct promisor_remote *r = repo_promisor_remote_find(repo, info->name); And instead of iterating through the accepted filters we now iterate through the accepted remotes and take their respective filters from the promisor remote info. > - string_list_clear(&accepted_filters, 1); > + strvec_push(accepted, info->name); > > - /* Mark the remotes as accepted in the repository state */ > - for (size_t i = 0; i < accepted->nr; i++) { > - struct promisor_remote *r = repo_promisor_remote_find(repo, accepted->v[i]); > - if (r) > + if (r) { > r->accepted = 1; > + if (info->filter) { > + free(r->advertised_filter); > + r->advertised_filter = xstrdup(info->filter); > + } > + } > } > + > + promisor_info_list_clear(&accepted_remotes); > } Patrick