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

[PATCH 01/16] promisor-remote: try accepted remotes before others in get_direct()

From
Christian Couder <christian.couder@gmail.com>
Date
Mar 23, 2026, 08:05 UTC
Message-ID
<20260323080520.887550-2-christian.couder@gmail.com>
In-Reply-To
<20260323080520.887550-1-christian.couder@gmail.com>

When a server advertises promisor remotes and the client accepts some of them, those remotes carry the server's intent: 'fetch missing objects preferably from here', and the client agrees with that for the remotes it accepts.

However promisor_remote_get_direct() actually iterates over all promisor remotes in list order, which is the order they appear in the config files (except perhaps for the one appearing in the `extensions.partialClone` config variable which is tried last).

This means an existing, but not accepted, promisor remote, could be tried before the accepted ones, which does not reflect the intent of the agreement between client and server.

If the client doesn't care about what the server suggests, it should accept nothing and rely on its remotes as they are already configured.

To better reflect the agreement between client and server, let's make promisor_remote_get_direct() try the accepted promisor remotes before the non-accepted ones.

Concretely, let's extract a try_promisor_remotes() helper and call it twice from promisor_remote_get_direct():

- first with an `accepted_only=true` argument to try only the accepted
  remotes,
- then with `accepted_only=false` to fall back to any remaining remote.

Ensuring that accepted remotes are preferred will be even more important if in the future a mechanism is developed to allow the client to auto-configure remotes that the server advertises. This will in particular avoid fetching from the server (which is already configured as a promisor remote) before trying the auto-configured remotes, as these new remotes would likely appear at the end of the config file, and as the server might not appear in the `extensions.partialClone` config variable.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 promisor-remote.c | 46 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 13 deletions(-)
diff --git a/promisor-remote.c b/promisor-remote.c
index 96fa215b06..3f8aeee787 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -268,11 +268,37 @@ static int remove_fetched_oids(struct repository *repo,
 	return remaining_nr;
 }
 
+static int try_promisor_remotes(struct repository *repo,
+				struct object_id **remaining_oids,
+				int *remaining_nr, int *to_free,
+				bool accepted_only)
+{
+	struct promisor_remote *r = repo->promisor_remote_config->promisors;
+
+	for (; r; r = r->next) {
+		if (accepted_only && !r->accepted)
+			continue;
+		if (!accepted_only && r->accepted)
+			continue;
+		if (fetch_objects(repo, r->name, *remaining_oids, *remaining_nr) < 0) {
+			if (*remaining_nr == 1)
+				continue;
+			*remaining_nr = remove_fetched_oids(repo, remaining_oids,
+							    *remaining_nr, *to_free);
+			if (*remaining_nr) {
+				*to_free = 1;
+				continue;
+			}
+		}
+		return 1; /* all fetched */
+	}
+	return 0;
+}
+
 void promisor_remote_get_direct(struct repository *repo,
 				const struct object_id *oids,
 				int oid_nr)
 {
-	struct promisor_remote *r;
 	struct object_id *remaining_oids = (struct object_id *)oids;
 	int remaining_nr = oid_nr;
 	int to_free = 0;
@@ -283,19 +309,13 @@ void promisor_remote_get_direct(struct repository *repo,
 
 	promisor_remote_init(repo);
 
-	for (r = repo->promisor_remote_config->promisors; r; r = r->next) {
-		if (fetch_objects(repo, r->name, remaining_oids, remaining_nr) < 0) {
-			if (remaining_nr == 1)
-				continue;
-			remaining_nr = remove_fetched_oids(repo, &remaining_oids,
-							 remaining_nr, to_free);
-			if (remaining_nr) {
-				to_free = 1;
-				continue;
-			}
-		}
+	/* Try accepted remotes first (those the server told us to use) */
+	if (try_promisor_remotes(repo, &remaining_oids, &remaining_nr,
+				 &to_free, true))
+		goto all_fetched;
+	if (try_promisor_remotes(repo, &remaining_oids, &remaining_nr,
+				 &to_free, false))
 		goto all_fetched;
-	}
 
 	for (i = 0; i < remaining_nr; i++) {
 		if (is_promisor_object(repo, &remaining_oids[i]))
-- 
2.53.0.625.g20f70b52bb
Previous: Christian CouderNext: Patrick Steinhardt
Message 2 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.