From: Jonathan Tan <jonathantanmy@google.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>
Subject: [PATCH 1/4] connect: refactor building of Extra Parameters
Date: Mon, 2 Nov 2020 16:26:10 -0800 [thread overview]
Message-ID: <7893cfba05a663370f353cdf60aa1df24b386c04.1604362701.git.jonathantanmy@google.com> (raw)
In-Reply-To: <cover.1604362701.git.jonathantanmy@google.com>
Build the Extra Parameters string ("version=%d") in only one place
(git_connect()) instead of two (git_connect() and push_ssh_options()).
This is in preparation for a subsequent patch, which will change how the
Extra Parameters are built.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
connect.c | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/connect.c b/connect.c
index 8b8f56cf6d..5221f1764c 100644
--- a/connect.c
+++ b/connect.c
@@ -1201,14 +1201,13 @@ static struct child_process *git_connect_git(int fd[2], char *hostandport,
*/
static void push_ssh_options(struct strvec *args, struct strvec *env,
enum ssh_variant variant, const char *port,
- enum protocol_version version, int flags)
+ const char *extra_parameters, int flags)
{
- if (variant == VARIANT_SSH &&
- version > 0) {
+ if (variant == VARIANT_SSH && extra_parameters) {
strvec_push(args, "-o");
strvec_push(args, "SendEnv=" GIT_PROTOCOL_ENVIRONMENT);
- strvec_pushf(env, GIT_PROTOCOL_ENVIRONMENT "=version=%d",
- version);
+ strvec_pushf(env, GIT_PROTOCOL_ENVIRONMENT "=%s",
+ extra_parameters);
}
if (flags & CONNECT_IPV4) {
@@ -1261,7 +1260,7 @@ static void push_ssh_options(struct strvec *args, struct strvec *env,
/* Prepare a child_process for use by Git's SSH-tunneled transport. */
static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
- const char *port, enum protocol_version version,
+ const char *port, const char *extra_parameters,
int flags)
{
const char *ssh;
@@ -1296,14 +1295,14 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
strvec_push(&detect.args, ssh);
strvec_push(&detect.args, "-G");
push_ssh_options(&detect.args, &detect.env_array,
- VARIANT_SSH, port, version, flags);
+ VARIANT_SSH, port, extra_parameters, flags);
strvec_push(&detect.args, ssh_host);
variant = run_command(&detect) ? VARIANT_SIMPLE : VARIANT_SSH;
}
strvec_push(&conn->args, ssh);
- push_ssh_options(&conn->args, &conn->env_array, variant, port, version, flags);
+ push_ssh_options(&conn->args, &conn->env_array, variant, port, extra_parameters, flags);
strvec_push(&conn->args, ssh_host);
}
@@ -1352,6 +1351,7 @@ struct child_process *git_connect(int fd[2], const char *url,
} else {
struct strbuf cmd = STRBUF_INIT;
const char *const *var;
+ struct strbuf extra_parameters = STRBUF_INIT;
conn = xmalloc(sizeof(*conn));
child_process_init(conn);
@@ -1367,6 +1367,9 @@ struct child_process *git_connect(int fd[2], const char *url,
for (var = local_repo_env; *var; var++)
strvec_push(&conn->env_array, *var);
+ if (version > 0)
+ strbuf_addf(&extra_parameters, "version=%d", version);
+
conn->use_shell = 1;
conn->in = conn->out = -1;
if (protocol == PROTO_SSH) {
@@ -1392,15 +1395,16 @@ struct child_process *git_connect(int fd[2], const char *url,
return NULL;
}
conn->trace2_child_class = "transport/ssh";
- fill_ssh_args(conn, ssh_host, port, version, flags);
+ fill_ssh_args(conn, ssh_host, port,
+ extra_parameters.len ? extra_parameters.buf : NULL,
+ flags);
} else {
transport_check_allowed("file");
conn->trace2_child_class = "transport/file";
- if (version > 0) {
+ if (extra_parameters.len)
strvec_pushf(&conn->env_array,
- GIT_PROTOCOL_ENVIRONMENT "=version=%d",
- version);
- }
+ GIT_PROTOCOL_ENVIRONMENT "=%s",
+ extra_parameters.buf);
}
strvec_push(&conn->args, cmd.buf);
@@ -1409,6 +1413,7 @@ struct child_process *git_connect(int fd[2], const char *url,
fd[0] = conn->out; /* read from child's stdout */
fd[1] = conn->in; /* write to child's stdin */
+ strbuf_release(&extra_parameters);
strbuf_release(&cmd);
}
free(hostandport);
--
2.29.1.341.ge80a0c044ae-goog
next prev parent reply other threads:[~2020-11-03 0:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 0:26 [PATCH 0/4] "Push" protocol change proposal: user-specified base Jonathan Tan
2020-11-03 0:26 ` Jonathan Tan [this message]
2020-11-03 0:26 ` [PATCH 2/4] push: teach --base for ssh:// and file:// Jonathan Tan
2020-11-03 10:23 ` SZEDER Gábor
2020-11-08 19:31 ` Junio C Hamano
2020-11-03 13:57 ` Derrick Stolee
2020-11-08 19:30 ` Junio C Hamano
2020-11-03 0:26 ` [PATCH 3/4] remote-curl: teach --base for http(s):// Jonathan Tan
2020-11-03 1:13 ` Junio C Hamano
2020-11-03 0:26 ` [PATCH 4/4] Doc: push with --base Jonathan Tan
2020-11-03 5:35 ` Jonathan Nieder
2020-11-03 15:18 ` Jeff King
2020-11-03 17:35 ` Junio C Hamano
2020-11-09 19:56 ` Jonathan Tan
2020-11-09 21:00 ` Derrick Stolee
2020-11-09 22:22 ` Jonathan Tan
2020-11-09 21:20 ` Junio C Hamano
2020-11-09 21:40 ` Jeff King
2020-11-09 22:47 ` Jonathan Tan
2020-11-03 13:53 ` Derrick Stolee
2020-11-03 0:46 ` [PATCH 0/4] "Push" protocol change proposal: user-specified base Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7893cfba05a663370f353cdf60aa1df24b386c04.1604362701.git.jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).