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

[PATCH 07/10] promisor-remote: refactor accept_from_server()

From
Christian Couder <christian.couder@gmail.com>
Date
Apr 2, 2026, 07:06 UTC
Message-ID
<20260402070613.85934-8-christian.couder@gmail.com>
In-Reply-To
<20260402070613.85934-1-christian.couder@gmail.com>

In future commits, we are going to add more logic to filter_promisor_remote() which is already doing a lot of things.

Let's alleviate that by moving the logic that checks and validates the value of the `promisor.acceptFromServer` config variable into its own accept_from_server() helper function.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 promisor-remote.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/promisor-remote.c b/promisor-remote.c
index d60518f19c..8d80ef6040 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -862,20 +862,12 @@ static bool promisor_store_advertised_fields(struct promisor_info *advertised,
 	return reload_config;
 }
 
-static void filter_promisor_remote(struct repository *repo,
-				   struct strvec *accepted,
-				   const char *info)
+static enum accept_promisor accept_from_server(struct repository *repo)
 {
 	const char *accept_str;
 	enum accept_promisor accept = ACCEPT_NONE;
-	struct string_list config_info = STRING_LIST_INIT_NODUP;
-	struct string_list remote_info = STRING_LIST_INIT_DUP;
-	struct store_info *store_info = NULL;
-	struct string_list_item *item;
-	bool reload_config = false;
-	struct string_list accepted_filters = STRING_LIST_INIT_DUP;
 
-	if (!repo_config_get_string_tmp(the_repository, "promisor.acceptfromserver", &accept_str)) {
+	if (!repo_config_get_string_tmp(repo, "promisor.acceptfromserver", &accept_str)) {
 		if (!*accept_str || !strcasecmp("None", accept_str))
 			accept = ACCEPT_NONE;
 		else if (!strcasecmp("KnownUrl", accept_str))
@@ -889,6 +881,21 @@ static void filter_promisor_remote(struct repository *repo,
 				accept_str, "promisor.acceptfromserver");
 	}
 
+	return accept;
+}
+
+static void filter_promisor_remote(struct repository *repo,
+				   struct strvec *accepted,
+				   const char *info)
+{
+	struct string_list config_info = STRING_LIST_INIT_NODUP;
+	struct string_list remote_info = STRING_LIST_INIT_DUP;
+	struct store_info *store_info = NULL;
+	struct string_list_item *item;
+	bool reload_config = false;
+	struct string_list accepted_filters = STRING_LIST_INIT_DUP;
+	enum accept_promisor accept = accept_from_server(repo);
+
 	if (accept == ACCEPT_NONE)
 		return;
 
-- 
2.53.0.765.g57b94de1f0.dirty
Previous: Christian CouderNext: Christian Couder
Message 12 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.