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

[PATCH v7 2/3] connect, transport: encapsulate arg in struct

From
JTJonathan Tan <jonathantanmy@google.com>
Date
Feb 5, 2021, 04:58 UTC
Message-ID
<d4ed13d02e589ed8b10ebe719dfd2ef4a326fbab.1612493309.git.jonathantanmy@google.com>
In-Reply-To
<cover.1612493309.git.jonathantanmy@google.com>

In a future patch we plan to return the name of an unborn current branch from deep in the callchain to a caller via a new pointer parameter that points at a variable in the caller when the caller calls get_remote_refs() and transport_get_remote_refs().

In preparation for that, encapsulate the existing ref_prefixes parameter into a struct. The aforementioned unborn current branch will go into this new struct in the future patch.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/clone.c      | 18 +++++++++++-------
 builtin/fetch-pack.c |  3 ++-
 builtin/fetch.c      | 18 +++++++++++-------
 builtin/ls-remote.c  |  9 +++++----
 connect.c            |  4 +++-
 remote.h             |  4 +++-
 transport-helper.c   |  5 +++--
 transport-internal.h | 10 ++--------
 transport.c          | 23 ++++++++++++-----------
 transport.h          | 21 ++++++++++++++-------
 10 files changed, 66 insertions(+), 49 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index a5630337e4..211d4f54b0 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -979,7 +979,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	int err = 0, complete_refs_before_fetch = 1;
 	int submodule_progress;
 
-	struct strvec ref_prefixes = STRVEC_INIT;
+	struct transport_ls_refs_options transport_ls_refs_options =
+		TRANSPORT_LS_REFS_OPTIONS_INIT;
 
 	packet_trace_identity("clone");
 
@@ -1257,14 +1258,17 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		transport->smart_options->check_self_contained_and_connected = 1;
 
 
-	strvec_push(&ref_prefixes, "HEAD");
-	refspec_ref_prefixes(&remote->fetch, &ref_prefixes);
+	strvec_push(&transport_ls_refs_options.ref_prefixes, "HEAD");
+	refspec_ref_prefixes(&remote->fetch,
+			     &transport_ls_refs_options.ref_prefixes);
 	if (option_branch)
-		expand_ref_prefix(&ref_prefixes, option_branch);
+		expand_ref_prefix(&transport_ls_refs_options.ref_prefixes,
+				  option_branch);
 	if (!option_no_tags)
-		strvec_push(&ref_prefixes, "refs/tags/");
+		strvec_push(&transport_ls_refs_options.ref_prefixes,
+			    "refs/tags/");
 
-	refs = transport_get_remote_refs(transport, &ref_prefixes);
+	refs = transport_get_remote_refs(transport, &transport_ls_refs_options);
 
 	if (refs) {
 		int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
@@ -1380,6 +1384,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	strbuf_release(&key);
 	junk_mode = JUNK_LEAVE_ALL;
 
-	strvec_clear(&ref_prefixes);
+	strvec_clear(&transport_ls_refs_options.ref_prefixes);
 	return err;
 }
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 58b7c1fbdc..c2d96f4c89 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -220,7 +220,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
 	version = discover_version(&reader);
 	switch (version) {
 	case protocol_v2:
-		get_remote_refs(fd[1], &reader, &ref, 0, NULL, NULL, args.stateless_rpc);
+		get_remote_refs(fd[1], &reader, &ref, 0, NULL, NULL,
+				args.stateless_rpc);
 		break;
 	case protocol_v1:
 	case protocol_v0:
diff --git a/builtin/fetch.c b/builtin/fetch.c
index ecf8537605..837382ef4f 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1349,7 +1349,8 @@ static int do_fetch(struct transport *transport,
 	int autotags = (transport->remote->fetch_tags == 1);
 	int retcode = 0;
 	const struct ref *remote_refs;
-	struct strvec ref_prefixes = STRVEC_INIT;
+	struct transport_ls_refs_options transport_ls_refs_options =
+		TRANSPORT_LS_REFS_OPTIONS_INIT;
 	int must_list_refs = 1;
 
 	if (tags == TAGS_DEFAULT) {
@@ -1369,7 +1370,7 @@ static int do_fetch(struct transport *transport,
 	if (rs->nr) {
 		int i;
 
-		refspec_ref_prefixes(rs, &ref_prefixes);
+		refspec_ref_prefixes(rs, &transport_ls_refs_options.ref_prefixes);
 
 		/*
 		 * We can avoid listing refs if all of them are exact
@@ -1383,22 +1384,25 @@ static int do_fetch(struct transport *transport,
 			}
 		}
 	} else if (transport->remote && transport->remote->fetch.nr)
-		refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
+		refspec_ref_prefixes(&transport->remote->fetch,
+				     &transport_ls_refs_options.ref_prefixes);
 
 	if (tags == TAGS_SET || tags == TAGS_DEFAULT) {
 		must_list_refs = 1;
-		if (ref_prefixes.nr)
-			strvec_push(&ref_prefixes, "refs/tags/");
+		if (transport_ls_refs_options.ref_prefixes.nr)
+			strvec_push(&transport_ls_refs_options.ref_prefixes,
+				    "refs/tags/");
 	}
 
 	if (must_list_refs) {
 		trace2_region_enter("fetch", "remote_refs", the_repository);
-		remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
+		remote_refs = transport_get_remote_refs(transport,
+							&transport_ls_refs_options);
 		trace2_region_leave("fetch", "remote_refs", the_repository);
 	} else
 		remote_refs = NULL;
 
-	strvec_clear(&ref_prefixes);
+	strvec_clear(&transport_ls_refs_options.ref_prefixes);
 
 	ref_map = get_ref_map(transport->remote, remote_refs, rs,
 			      tags, &autotags);
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index 092917eca2..ef604752a0 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -45,7 +45,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 	int show_symref_target = 0;
 	const char *uploadpack = NULL;
 	const char **pattern = NULL;
-	struct strvec ref_prefixes = STRVEC_INIT;
+	struct transport_ls_refs_options transport_options =
+		TRANSPORT_LS_REFS_OPTIONS_INIT;
 	int i;
 	struct string_list server_options = STRING_LIST_INIT_DUP;
 
@@ -94,9 +95,9 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 	}
 
 	if (flags & REF_TAGS)
-		strvec_push(&ref_prefixes, "refs/tags/");
+		strvec_push(&transport_options.ref_prefixes, "refs/tags/");
 	if (flags & REF_HEADS)
-		strvec_push(&ref_prefixes, "refs/heads/");
+		strvec_push(&transport_options.ref_prefixes, "refs/heads/");
 
 	remote = remote_get(dest);
 	if (!remote) {
@@ -118,7 +119,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 	if (server_options.nr)
 		transport->server_options = &server_options;
 
-	ref = transport_get_remote_refs(transport, &ref_prefixes);
+	ref = transport_get_remote_refs(transport, &transport_options);
 	if (ref) {
 		int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
 		repo_set_hash_algo(the_repository, hash_algo);
diff --git a/connect.c b/connect.c
index 8b8f56cf6d..328c279250 100644
--- a/connect.c
+++ b/connect.c
@@ -453,12 +453,14 @@ void check_stateless_delimiter(int stateless_rpc,
 
 struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
 			     struct ref **list, int for_push,
-			     const struct strvec *ref_prefixes,
+			     struct transport_ls_refs_options *transport_options,
 			     const struct string_list *server_options,
 			     int stateless_rpc)
 {
 	int i;
 	const char *hash_name;
+	struct strvec *ref_prefixes = transport_options ?
+		&transport_options->ref_prefixes : NULL;
 	*list = NULL;
 
 	if (server_supports_v2("ls-refs", 1))
diff --git a/remote.h b/remote.h
index 3211abdf05..4ae676a11b 100644
--- a/remote.h
+++ b/remote.h
@@ -6,6 +6,8 @@
 #include "hashmap.h"
 #include "refspec.h"
 
+struct transport_ls_refs_options;
+
 /**
  * The API gives access to the configuration related to remotes. It handles
  * all three configuration mechanisms historically and currently used by Git,
@@ -196,7 +198,7 @@ struct ref **get_remote_heads(struct packet_reader *reader,
 /* Used for protocol v2 in order to retrieve refs from a remote */
 struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
 			     struct ref **list, int for_push,
-			     const struct strvec *ref_prefixes,
+			     struct transport_ls_refs_options *transport_options,
 			     const struct string_list *server_options,
 			     int stateless_rpc);
 
diff --git a/transport-helper.c b/transport-helper.c
index 5f6e0b3bd8..49b7fb4dcb 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -1162,13 +1162,14 @@ static int has_attribute(const char *attrs, const char *attr)
 }
 
 static struct ref *get_refs_list(struct transport *transport, int for_push,
-				 const struct strvec *ref_prefixes)
+				 struct transport_ls_refs_options *transport_options)
 {
 	get_helper(transport);
 
 	if (process_connect(transport, for_push)) {
 		do_take_over(transport);
-		return transport->vtable->get_refs_list(transport, for_push, ref_prefixes);
+		return transport->vtable->get_refs_list(transport, for_push,
+							transport_options);
 	}
 
 	return get_refs_list_using_list(transport, for_push);
diff --git a/transport-internal.h b/transport-internal.h
index 27c9daffc4..b60f1ba907 100644
--- a/transport-internal.h
+++ b/transport-internal.h
@@ -4,6 +4,7 @@
 struct ref;
 struct transport;
 struct strvec;
+struct transport_ls_refs_options;
 
 struct transport_vtable {
 	/**
@@ -18,19 +19,12 @@ struct transport_vtable {
 	 * the transport to try to share connections, for_push is a
 	 * hint as to whether the ultimate operation is a push or a fetch.
 	 *
-	 * If communicating using protocol v2 a list of prefixes can be
-	 * provided to be sent to the server to enable it to limit the ref
-	 * advertisement.  Since ref filtering is done on the server's end, and
-	 * only when using protocol v2, this list will be ignored when not
-	 * using protocol v2 meaning this function can return refs which don't
-	 * match the provided ref_prefixes.
-	 *
 	 * If the transport is able to determine the remote hash for
 	 * the ref without a huge amount of effort, it should store it
 	 * in the ref's old_sha1 field; otherwise it should be all 0.
 	 **/
 	struct ref *(*get_refs_list)(struct transport *transport, int for_push,
-				     const struct strvec *ref_prefixes);
+				     struct transport_ls_refs_options *transport_options);
 
 	/**
 	 * Fetch the objects for the given refs. Note that this gets
diff --git a/transport.c b/transport.c
index 679a35e7c1..b13fab5dc3 100644
--- a/transport.c
+++ b/transport.c
@@ -127,7 +127,7 @@ struct bundle_transport_data {
 
 static struct ref *get_refs_from_bundle(struct transport *transport,
 					int for_push,
-					const struct strvec *ref_prefixes)
+					struct transport_ls_refs_options *transport_options)
 {
 	struct bundle_transport_data *data = transport->data;
 	struct ref *result = NULL;
@@ -280,7 +280,7 @@ static void die_if_server_options(struct transport *transport)
  * remote refs.
  */
 static struct ref *handshake(struct transport *transport, int for_push,
-			     const struct strvec *ref_prefixes,
+			     struct transport_ls_refs_options *options,
 			     int must_list_refs)
 {
 	struct git_transport_data *data = transport->data;
@@ -303,7 +303,7 @@ static struct ref *handshake(struct transport *transport, int for_push,
 			trace2_data_string("transfer", NULL, "server-sid", server_sid);
 		if (must_list_refs)
 			get_remote_refs(data->fd[1], &reader, &refs, for_push,
-					ref_prefixes,
+					options,
 					transport->server_options,
 					transport->stateless_rpc);
 		break;
@@ -334,9 +334,9 @@ static struct ref *handshake(struct transport *transport, int for_push,
 }
 
 static struct ref *get_refs_via_connect(struct transport *transport, int for_push,
-					const struct strvec *ref_prefixes)
+					struct transport_ls_refs_options *options)
 {
-	return handshake(transport, for_push, ref_prefixes, 1);
+	return handshake(transport, for_push, options, 1);
 }
 
 static int fetch_refs_via_pack(struct transport *transport,
@@ -1252,19 +1252,20 @@ int transport_push(struct repository *r,
 		int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
 		int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
 		int push_ret, ret, err;
-		struct strvec ref_prefixes = STRVEC_INIT;
+		struct transport_ls_refs_options transport_options =
+			TRANSPORT_LS_REFS_OPTIONS_INIT;
 
 		if (check_push_refs(local_refs, rs) < 0)
 			return -1;
 
-		refspec_ref_prefixes(rs, &ref_prefixes);
+		refspec_ref_prefixes(rs, &transport_options.ref_prefixes);
 
 		trace2_region_enter("transport_push", "get_refs_list", r);
 		remote_refs = transport->vtable->get_refs_list(transport, 1,
-							       &ref_prefixes);
+							       &transport_options);
 		trace2_region_leave("transport_push", "get_refs_list", r);
 
-		strvec_clear(&ref_prefixes);
+		strvec_clear(&transport_options.ref_prefixes);
 
 		if (flags & TRANSPORT_PUSH_ALL)
 			match_flags |= MATCH_REFS_ALL;
@@ -1380,12 +1381,12 @@ int transport_push(struct repository *r,
 }
 
 const struct ref *transport_get_remote_refs(struct transport *transport,
-					    const struct strvec *ref_prefixes)
+					    struct transport_ls_refs_options *transport_options)
 {
 	if (!transport->got_remote_refs) {
 		transport->remote_refs =
 			transport->vtable->get_refs_list(transport, 0,
-							 ref_prefixes);
+							 transport_options);
 		transport->got_remote_refs = 1;
 	}
 
diff --git a/transport.h b/transport.h
index 24558c027d..1f5b60e4d3 100644
--- a/transport.h
+++ b/transport.h
@@ -233,17 +233,24 @@ int transport_push(struct repository *repo,
 		   struct refspec *rs, int flags,
 		   unsigned int * reject_reasons);
 
+struct transport_ls_refs_options {
+	/*
+	 * Optionally, a list of ref prefixes can be provided which can be sent
+	 * to the server (when communicating using protocol v2) to enable it to
+	 * limit the ref advertisement.  Since ref filtering is done on the
+	 * server's end (and only when using protocol v2),
+	 * transport_get_remote_refs() could return refs which don't match the
+	 * provided ref_prefixes.
+	 */
+	struct strvec ref_prefixes;
+};
+#define TRANSPORT_LS_REFS_OPTIONS_INIT { STRVEC_INIT }
+
 /*
  * Retrieve refs from a remote.
- *
- * Optionally a list of ref prefixes can be provided which can be sent to the
- * server (when communicating using protocol v2) to enable it to limit the ref
- * advertisement.  Since ref filtering is done on the server's end (and only
- * when using protocol v2), this can return refs which don't match the provided
- * ref_prefixes.
  */
 const struct ref *transport_get_remote_refs(struct transport *transport,
-					    const struct strvec *ref_prefixes);
+					    struct transport_ls_refs_options *transport_options);
 
 /*
  * Fetch the hash algorithm used by a remote.

-- 
2.30.0.365.g02bc693789-goog
Previous: Jeff KingNext: Jonathan Tan
Message 98 of 109 in “Cloning empty repository uses locally configured default branch name”
  1. Jonathan TanDec 8, 2020
  2. Junio C HamanoDec 8, 2020
  3. brian m. carlsonDec 8, 2020
  4. Jonathan TanDec 8, 2020
  5. Junio C HamanoDec 8, 2020
  6. Jeff KingDec 8, 2020
  7. Jonathan TanDec 8, 2020
  8. Jeff KingDec 8, 2020
  9. clone: in protocol v2, use remote's default branchJonathan Tan, Dec 11, 2020
  10. Junio C HamanoDec 11, 2020
  11. Ævar Arnfjörð BjarmasonDec 14, 2020
  12. Felipe ContrerasDec 14, 2020
  13. Junio C HamanoDec 14, 2020
  14. Ævar Arnfjörð BjarmasonDec 15, 2020
  15. Junio C HamanoDec 15, 2020
  16. Jeff KingDec 15, 2020
  17. Junio C HamanoDec 15, 2020
  18. Jeff KingDec 15, 2020
  19. Junio C HamanoDec 16, 2020
  20. Jeff KingDec 16, 2020
  21. Junio C HamanoDec 16, 2020
  22. Jeff KingDec 18, 2020
  23. Felipe ContrerasDec 15, 2020
  24. Jonathan TanDec 14, 2020
  25. Felipe ContrerasDec 14, 2020
  26. Jeff KingDec 15, 2020
  27. Jonathan TanDec 15, 2020
  28. 0/3 Cloning with remote unborn HEADJonathan Tan, Dec 16, 2020
  29. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Dec 16, 2020
  30. Junio C HamanoDec 16, 2020
  31. Jonathan TanDec 16, 2020
  32. Jeff KingDec 16, 2020
  33. Jonathan TanDec 16, 2020
  34. Junio C HamanoDec 17, 2020
  35. Jeff KingDec 18, 2020
  36. 2/3 connect, transport: add no-op arg for future patchJonathan Tan, Dec 16, 2020
  37. Junio C HamanoDec 16, 2020
  38. 3/3 clone: respect remote unborn HEADJonathan Tan, Dec 16, 2020
  39. 0/3 Cloning with remote unborn HEADJonathan Tan, Dec 21, 2020
  40. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Dec 21, 2020
  41. 2/3 connect, transport: add no-op arg for future patchJonathan Tan, Dec 21, 2020
  42. 3/3 clone: respect remote unborn HEADJonathan Tan, Dec 21, 2020
  43. Junio C HamanoDec 21, 2020
  44. Jeff KingJan 21, 2021
  45. 0/3 Cloning with remote unborn HEADJonathan Tan, Dec 22, 2020
  46. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Dec 22, 2020
  47. Jeff KingJan 21, 2021
  48. Jonathan TanJan 26, 2021
  49. Jeff KingJan 26, 2021
  50. 2/3 connect, transport: add no-op arg for future patchJonathan Tan, Dec 22, 2020
  51. Jeff KingJan 21, 2021
  52. Jonathan TanJan 26, 2021
  53. 3/3 clone: respect remote unborn HEADJonathan Tan, Dec 22, 2020
  54. Jeff KingJan 21, 2021
  55. Jonathan TanJan 26, 2021
  56. Jeff KingJan 26, 2021
  57. Junio C HamanoJan 28, 2021
  58. Junio C HamanoDec 22, 2020
  59. 0/3 Cloning with remote unborn HEADJonathan Tan, Jan 26, 2021
  60. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Jan 26, 2021
  61. Junio C HamanoJan 26, 2021
  62. Jeff KingJan 26, 2021
  63. Junio C HamanoJan 26, 2021
  64. Junio C HamanoJan 26, 2021
  65. Jonathan TanJan 30, 2021
  66. Jonathan TanJan 29, 2021
  67. Junio C HamanoJan 29, 2021
  68. Jonathan TanFeb 2, 2021
  69. Junio C HamanoFeb 2, 2021
  70. Ævar Arnfjörð BjarmasonJan 27, 2021
  71. Jonathan TanJan 30, 2021
  72. 2/3 connect, transport: encapsulate arg in structJonathan Tan, Jan 26, 2021
  73. Junio C HamanoJan 26, 2021
  74. Jonathan TanJan 30, 2021
  75. 3/3 clone: respect remote unborn HEADJonathan Tan, Jan 26, 2021
  76. Junio C HamanoJan 26, 2021
  77. Jonathan TanJan 30, 2021
  78. Ævar Arnfjörð BjarmasonJan 27, 2021
  79. Jonathan TanJan 30, 2021
  80. Ævar Arnfjörð BjarmasonJan 30, 2021
  81. Jonathan TanFeb 2, 2021
  82. Ævar Arnfjörð BjarmasonFeb 3, 2021
  83. Junio C HamanoFeb 5, 2021
  84. Junio C HamanoJan 27, 2021
  85. Jeff KingJan 27, 2021
  86. Junio C HamanoJan 27, 2021
  87. 0/3 Cloning with remote unborn HEADJonathan Tan, Feb 2, 2021
  88. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Feb 2, 2021
  89. Junio C HamanoFeb 2, 2021
  90. Jonathan TanFeb 2, 2021
  91. Junio C HamanoFeb 2, 2021
  92. Jonathan TanFeb 3, 2021
  93. 2/3 connect, transport: encapsulate arg in structJonathan Tan, Feb 2, 2021
  94. 3/3 clone: respect remote unborn HEADJonathan Tan, Feb 2, 2021
  95. 0/3 Cloning with remote unborn HEADJonathan Tan, Feb 5, 2021
  96. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Feb 5, 2021
  97. Jeff KingFeb 5, 2021
  98. 2/3 connect, transport: encapsulate arg in structJonathan Tan, Feb 5, 2021
  99. 3/3 clone: respect remote unborn HEADJonathan Tan, Feb 5, 2021
  100. Junio C HamanoFeb 5, 2021
  101. Ævar Arnfjörð BjarmasonFeb 5, 2021
  102. Junio C HamanoFeb 5, 2021
  103. Jeff KingFeb 5, 2021
  104. 0/3 Cloning with remote unborn HEADJonathan Tan, Feb 5, 2021
  105. 3/3 clone: respect remote unborn HEADJonathan Tan, Feb 5, 2021
  106. 2/3 connect, transport: encapsulate arg in structJonathan Tan, Feb 5, 2021
  107. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Feb 5, 2021
  108. Junio C HamanoFeb 6, 2021
  109. Junio C HamanoFeb 8, 2021

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.