From: Patrick Steinhardt <ps@pks.im>
To: Christian Couder <christian.couder@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Taylor Blau <me@ttaylorr.com>,
Karthik Nayak <karthik.188@gmail.com>,
Elijah Newren <newren@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [PATCH 07/16] promisor-remote: keep accepted promisor_info structs alive
Date: Thu, 26 Mar 2026 13:21:03 +0100 [thread overview]
Message-ID: <acUkr2xxQZSJU2lL@pks.im> (raw)
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
next prev parent reply other threads:[~2026-03-26 12:21 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-23 8:05 [PATCH 00/16] Auto-configure advertised remotes via URL whitelist Christian Couder
2026-03-23 8:05 ` [PATCH 01/16] promisor-remote: try accepted remotes before others in get_direct() Christian Couder
2026-03-26 12:20 ` Patrick Steinhardt
2026-03-23 8:05 ` [PATCH 02/16] urlmatch: change 'allow_globs' arg to bool Christian Couder
2026-03-23 8:05 ` [PATCH 03/16] urlmatch: add url_is_valid_pattern() helper Christian Couder
2026-03-26 12:20 ` Patrick Steinhardt
2026-03-23 8:05 ` [PATCH 04/16] promisor-remote: clarify that a remote is ignored Christian Couder
2026-03-26 12:20 ` Patrick Steinhardt
2026-03-23 8:05 ` [PATCH 05/16] promisor-remote: refactor has_control_char() Christian Couder
2026-03-23 8:05 ` [PATCH 06/16] promisor-remote: refactor accept_from_server() Christian Couder
2026-03-23 8:05 ` [PATCH 07/16] promisor-remote: keep accepted promisor_info structs alive Christian Couder
2026-03-26 12:21 ` Patrick Steinhardt [this message]
2026-03-23 8:05 ` [PATCH 08/16] promisor-remote: remove the 'accepted' strvec Christian Couder
2026-03-26 12:21 ` Patrick Steinhardt
2026-03-23 8:05 ` [PATCH 09/16] promisor-remote: add 'local_name' to 'struct promisor_info' Christian Couder
2026-03-26 12:21 ` Patrick Steinhardt
2026-03-23 8:05 ` [PATCH 10/16] promisor-remote: pass config entry to all_fields_match() directly Christian Couder
2026-03-26 12:21 ` Patrick Steinhardt
2026-03-23 8:05 ` [PATCH 11/16] promisor-remote: refactor should_accept_remote() control flow Christian Couder
2026-03-26 12:21 ` Patrick Steinhardt
2026-03-23 8:05 ` [PATCH 12/16] t5710: use proper file:// URIs for absolute paths Christian Couder
2026-03-26 12:21 ` Patrick Steinhardt
2026-03-23 8:05 ` [PATCH 13/16] promisor-remote: introduce promisor.acceptFromServerUrl Christian Couder
2026-03-26 12:21 ` Patrick Steinhardt
2026-03-23 8:05 ` [PATCH 14/16] promisor-remote: trust known remotes matching acceptFromServerUrl Christian Couder
2026-03-23 18:54 ` Junio C Hamano
2026-03-23 23:47 ` Junio C Hamano
2026-03-27 12:17 ` Christian Couder
2026-03-26 12:21 ` Patrick Steinhardt
2026-03-23 8:05 ` [PATCH 15/16] promisor-remote: auto-configure unknown remotes Christian Couder
2026-03-26 12:21 ` Patrick Steinhardt
2026-03-23 8:05 ` [PATCH 16/16] doc: promisor: improve acceptFromServer entry Christian Couder
2026-03-26 12:21 ` [PATCH 00/16] Auto-configure advertised remotes via URL whitelist Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=acUkr2xxQZSJU2lL@pks.im \
--to=ps@pks.im \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karthik.188@gmail.com \
--cc=me@ttaylorr.com \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox