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

[PATCH v2 05/10] promisor-remote: refactor should_accept_remote() control flow

From
Christian Couder <christian.couder@gmail.com>
Date
Apr 7, 2026, 11:52 UTC
Message-ID
<20260407115243.358642-6-christian.couder@gmail.com>
In-Reply-To
<20260407115243.358642-1-christian.couder@gmail.com>

A previous commit made sure we now reject empty URLs early at parse time. This makes the existing warning() in case a remote URL is NULL or empty very unlikely to be useful.

In future work, we also plan to add URL-based acceptance logic into should_accept_remote().

To adapt to previous changes and prepare for upcoming changes, let's restructure the control flow in should_accept_remote().

Concretely, let's:
 - Replace the warning() in case of an empty URL with a BUG(), as a
   previous commit made sure empty URLs are rejected early at parse
   time.
 - Move that modified empty-URL check to the very top of the function,
   so that every acceptance mode, instead of only ACCEPT_KNOWN_URL, is
   covered.
 - Invert the URL comparison: instead of returning on match and
   warning on mismatch, return early on mismatch and let the match
   case fall through. This opens a single exit path at the bottom of
   the function for future commits to extend.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 promisor-remote.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/promisor-remote.c b/promisor-remote.c
index 8322349ae8..5860a3d3f3 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -651,6 +651,11 @@ static int should_accept_remote(enum accept_promisor accept,
 	const char *remote_name = advertised->name;
 	const char *remote_url = advertised->url;
 
+	if (!remote_url || !*remote_url)
+		BUG("no or empty URL advertised for remote '%s'; "
+		    "this remote should have been rejected earlier",
+		    remote_name);
+
 	if (accept == ACCEPT_ALL)
 		return all_fields_match(advertised, config_info, NULL);
 
@@ -669,19 +674,14 @@ static int should_accept_remote(enum accept_promisor accept,
 	if (accept != ACCEPT_KNOWN_URL)
 		BUG("Unhandled 'enum accept_promisor' value '%d'", accept);
 
-	if (!remote_url || !*remote_url) {
-		warning(_("no or empty URL advertised for remote '%s', "
-			  "ignoring this remote"), remote_name);
+	if (strcmp(p->url, remote_url)) {
+		warning(_("known remote named '%s' but with URL '%s' instead of '%s', "
+			  "ignoring this remote"),
+			remote_name, p->url, remote_url);
 		return 0;
 	}
 
-	if (!strcmp(p->url, remote_url))
-		return all_fields_match(advertised, config_info, p);
-
-	warning(_("known remote named '%s' but with URL '%s' instead of '%s', "
-		  "ignoring this remote"), remote_name, p->url, remote_url);
-
-	return 0;
+	return all_fields_match(advertised, config_info, p);
 }
 
 static int skip_field_name_prefix(const char *elem, const char *field_name, const char **value)
-- 
2.54.0.rc0.114.g05d466edb8
Previous: Junio C HamanoNext: Christian Couder
Message 30 of 35 in “Prepare for advertised remotes auto-configure via URL allowlist”
  1. 00/10 Prepare for advertised remotes auto-configure via URL allowlistChristian Couder, Apr 2, 2026
  2. 01/10 promisor-remote: try accepted remotes before others in get_direct()Christian Couder, Apr 2, 2026
  3. Patrick SteinhardtApr 2, 2026
  4. Christian CouderApr 7, 2026
  5. Junio C HamanoApr 7, 2026
  6. 02/10 promisor-remote: pass config entry to all_fields_match() directlyChristian Couder, Apr 2, 2026
  7. 03/10 promisor-remote: clarify that a remote is ignoredChristian Couder, Apr 2, 2026
  8. 04/10 promisor-remote: reject empty name or URL in advertised remoteChristian Couder, Apr 2, 2026
  9. Patrick SteinhardtApr 2, 2026
  10. 05/10 promisor-remote: refactor should_accept_remote() control flowChristian Couder, Apr 2, 2026
  11. 06/10 promisor-remote: refactor has_control_char()Christian Couder, Apr 2, 2026
  12. 07/10 promisor-remote: refactor accept_from_server()Christian Couder, Apr 2, 2026
  13. 08/10 promisor-remote: keep accepted promisor_info structs aliveChristian Couder, Apr 2, 2026
  14. 09/10 promisor-remote: remove the 'accepted' strvecChristian Couder, Apr 2, 2026
  15. 10/10 t5710: use proper file:// URIs for absolute pathsChristian Couder, Apr 2, 2026
  16. Junio C HamanoApr 2, 2026
  17. Christian CouderApr 3, 2026
  18. Christian CouderApr 7, 2026
  19. Patrick SteinhardtApr 2, 2026
  20. Junio C HamanoApr 2, 2026
  21. Christian CouderApr 7, 2026
  22. 00/10 Prepare for advertised remotes auto-configure via URL allowlistChristian Couder, Apr 7, 2026
  23. 01/10 promisor-remote: try accepted remotes before others in get_direct()Christian Couder, Apr 7, 2026
  24. 02/10 promisor-remote: pass config entry to all_fields_match() directlyChristian Couder, Apr 7, 2026
  25. Junio C HamanoApr 7, 2026
  26. 03/10 promisor-remote: clarify that a remote is ignoredChristian Couder, Apr 7, 2026
  27. Junio C HamanoApr 7, 2026
  28. 04/10 promisor-remote: reject empty name or URL in advertised remoteChristian Couder, Apr 7, 2026
  29. Junio C HamanoApr 7, 2026
  30. 05/10 promisor-remote: refactor should_accept_remote() control flowChristian Couder, Apr 7, 2026
  31. 06/10 promisor-remote: refactor has_control_char()Christian Couder, Apr 7, 2026
  32. 07/10 promisor-remote: refactor accept_from_server()Christian Couder, Apr 7, 2026
  33. 08/10 promisor-remote: keep accepted promisor_info structs aliveChristian Couder, Apr 7, 2026
  34. 09/10 promisor-remote: remove the 'accepted' strvecChristian Couder, Apr 7, 2026
  35. 10/10 t5710: use proper file:// URIs for absolute pathsChristian Couder, Apr 7, 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.