git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 10/16] promisor-remote: pass config entry to all_fields_match() directly

From
Christian Couder <christian.couder@gmail.com>
Date
Apr 2, 2026, 06:35 UTC
Message-ID
<CAP8UFD2Pp3vg=NtfYrpn=UEzpiPvu5F8nYiFrv+94tXh2LABPw@mail.gmail.com>
In-Reply-To
<acUkvkLYiO0wkCfm@pks.im>
On Thu, Mar 26, 2026 at 1:21 PM Patrick Steinhardt <ps@pks.im> wrote:
Show 6 quoted lines
>
> On Mon, Mar 23, 2026 at 09:05:13AM +0100, Christian Couder wrote:
> > The `in_list == 0` path of all_fields_match() re-looks up the
>
> This reads a bit weird. How about "looks up the remote in config_info by
> advertised->name repeatedly" instead?
Yeah, this is better. It's now used in the next version.
Show 40 quoted lines
> > diff --git a/promisor-remote.c b/promisor-remote.c
> > index da347fa2dc..8f2c1280c3 100644
> > --- a/promisor-remote.c
> > +++ b/promisor-remote.c
> > @@ -619,7 +627,11 @@ static int all_fields_match(struct promisor_info *advertised,
> >               if (!value)
> >                       return 0;
> >
> > -             if (in_list) {
> > +             if (config_entry) {
> > +                     match = match_field_against_config(field, value,
> > +                                                        config_entry);
> > +             } else {
> > +                     struct string_list_item *item;
> >                       for_each_string_list_item(item, config_info) {
> >                               struct promisor_info *p = item->util;
> >                               if (match_field_against_config(field, value, p)) {
> > @@ -627,12 +639,6 @@ static int all_fields_match(struct promisor_info *advertised,
> >                                       break;
> >                               }
> >                       }
> > -             } else {
> > -                     item = string_list_lookup(config_info, advertised->name);
> > -                     if (item) {
> > -                             struct promisor_info *p = item->util;
> > -                             match = match_field_against_config(field, value, p);
> > -                     }
> >               }
> >
> >               if (!match)
>
> Okay, the logic is reversed now, which makes sense as we now pass `NULL`
> instead of `1`, and the promisor info instead of `0`.
>
> The change itself makes sense, but other than that I have a very hard
> time understanding these two functions. I think they would strongly
> benefit from some comments explaining what's going on, what the input is
> and what we're trying to do. Of course that doesn't have to be part of
> this commit here, but I would appreciate a preparatory commit that helps
> guide the reader a bit.

The patch already added a comment in front of all_fields_match() but not in front of match_field_against_config(). Now it adds comments in front of both.

Thanks.
Previous: Patrick SteinhardtNext: Christian Couder
Message 24 of 47 in “Auto-configure advertised remotes via URL whitelist”
  1. 00/16 Auto-configure advertised remotes via URL whitelistChristian Couder, Mar 23, 2026
  2. 01/16 promisor-remote: try accepted remotes before others in get_direct()Christian Couder, Mar 23, 2026
  3. Patrick SteinhardtMar 26, 2026
  4. Christian CouderApr 2, 2026
  5. 02/16 urlmatch: change 'allow_globs' arg to boolChristian Couder, Mar 23, 2026
  6. 03/16 urlmatch: add url_is_valid_pattern() helperChristian Couder, Mar 23, 2026
  7. Patrick SteinhardtMar 26, 2026
  8. Christian CouderApr 27, 2026
  9. 04/16 promisor-remote: clarify that a remote is ignoredChristian Couder, Mar 23, 2026
  10. Patrick SteinhardtMar 26, 2026
  11. Christian CouderApr 2, 2026
  12. 05/16 promisor-remote: refactor has_control_char()Christian Couder, Mar 23, 2026
  13. 06/16 promisor-remote: refactor accept_from_server()Christian Couder, Mar 23, 2026
  14. 07/16 promisor-remote: keep accepted promisor_info structs aliveChristian Couder, Mar 23, 2026
  15. Patrick SteinhardtMar 26, 2026
  16. 08/16 promisor-remote: remove the 'accepted' strvecChristian Couder, Mar 23, 2026
  17. Patrick SteinhardtMar 26, 2026
  18. Christian CouderApr 2, 2026
  19. 09/16 promisor-remote: add 'local_name' to 'struct promisor_info'Christian Couder, Mar 23, 2026
  20. Patrick SteinhardtMar 26, 2026
  21. Christian CouderApr 27, 2026
  22. 10/16 promisor-remote: pass config entry to all_fields_match() directlyChristian Couder, Mar 23, 2026
  23. Patrick SteinhardtMar 26, 2026
  24. Christian CouderApr 2, 2026
  25. 12/16 t5710: use proper file:// URIs for absolute pathsChristian Couder, Mar 23, 2026
  26. Patrick SteinhardtMar 26, 2026
  27. Christian CouderApr 2, 2026
  28. 13/16 promisor-remote: introduce promisor.acceptFromServerUrlChristian Couder, Mar 23, 2026
  29. Patrick SteinhardtMar 26, 2026
  30. Christian CouderApr 27, 2026
  31. 11/16 promisor-remote: refactor should_accept_remote() control flowChristian Couder, Mar 23, 2026
  32. Patrick SteinhardtMar 26, 2026
  33. Christian CouderApr 2, 2026
  34. 14/16 promisor-remote: trust known remotes matching acceptFromServerUrlChristian Couder, Mar 23, 2026
  35. Junio C HamanoMar 23, 2026
  36. Junio C HamanoMar 23, 2026
  37. Christian CouderMar 27, 2026
  38. Junio C HamanoMar 31, 2026
  39. Christian CouderApr 1, 2026
  40. Patrick SteinhardtMar 26, 2026
  41. Christian CouderApr 27, 2026
  42. 16/16 doc: promisor: improve acceptFromServer entryChristian Couder, Mar 23, 2026
  43. 15/16 promisor-remote: auto-configure unknown remotesChristian Couder, Mar 23, 2026
  44. Patrick SteinhardtMar 26, 2026
  45. Christian CouderApr 27, 2026
  46. Patrick SteinhardtMar 26, 2026
  47. Christian CouderApr 2, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.