From: Brandon Williams <bmwill@google.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Stefan Beller <sbeller@google.com>,
Jonathan Tan <jonathantanmy@google.com>,
Segev Finer <segev208@gmail.com>
Subject: Re: [PATCH 4/8] connect: split ssh command line options into separate function
Date: Mon, 20 Nov 2017 14:28:20 -0800 [thread overview]
Message-ID: <20171120222820.GE92506@google.com> (raw)
In-Reply-To: <20171120220950.f5ipri354x6squck@aiede.mtv.corp.google.com>
On 11/20, Jonathan Nieder wrote:
> Hi,
>
> Brandon Williams wrote:
> > On 11/20, Jonathan Nieder wrote:
> [long stream of quoted context snipped; please cut down the quoted
> text to what you are replying to in the future]
> >> @@ -972,16 +1031,13 @@ struct child_process *git_connect(int fd[2], const char *url,
> >> conn->use_shell = 1;
> >> conn->in = conn->out = -1;
> >> if (protocol == PROTO_SSH) {
> >> - const char *ssh;
> >> - enum ssh_variant variant;
> >> char *ssh_host = hostandport;
> >> const char *port = NULL;
> >> +
> >> transport_check_allowed("ssh");
> >> get_host_and_port(&ssh_host, &port);
> >> -
> >> if (!port)
> >> port = get_port(ssh_host);
> >> -
> >
> > Are these random additions and deletions intentional?
>
> Sorry about that. It was to make the code easier to read, but I can
> see how it's jarring during review. I can resend without the removed
> blank lines if you like.
If its for better code readability I'm all for the additions and
deletions. I just wanted to make sure they were intentional :)
So I'm fine with either the original or the modified patch.
>
> For context, here's the code in question after the current patch:
>
> if (protocol == PROTO_SSH) {
> char *ssh_host = hostandport;
> const char *port = NULL;
>
> transport_check_allowed("ssh");
> get_host_and_port(&ssh_host, &port);
> if (!port)
> port = get_port(ssh_host);
> if (flags & CONNECT_DIAG_URL) {
> printf("Diag: url=%s\n", url ? url : "NULL");
> printf("Diag: protocol=%s\n", prot_name(protocol));
> printf("Diag: userandhost=%s\n", ssh_host ? ssh_host : "NULL");
> printf("Diag: port=%s\n", port ? port : "NONE");
> printf("Diag: path=%s\n", path ? path : "NULL");
>
> free(hostandport);
> free(path);
> free(conn);
> strbuf_release(&cmd);
> return NULL;
> }
> fill_ssh_args(conn, ssh_host, port, flags);
> } else {
> transport_check_allowed("file");
> if (get_protocol_version_config() > 0) {
> argv_array_pushf(&conn->env_array, GIT_PROTOCOL_ENVIRONMENT "=version=%d",
> get_protocol_version_config());
> }
> }
>
> Jonathan
--
Brandon Williams
next prev parent reply other threads:[~2017-11-20 22:28 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-20 21:21 [PATCH v3 0/8] Coping with unrecognized ssh wrapper scripts in GIT_SSH Jonathan Nieder
2017-11-20 21:22 ` [PATCH 1/8] ssh test: make copy_ssh_wrapper_as clean up after itself Jonathan Nieder
2017-11-20 21:47 ` Brandon Williams
2017-11-21 1:24 ` Junio C Hamano
2017-11-21 1:49 ` [PATCH 1/8 v2] " Jonathan Nieder
2017-11-21 23:42 ` Stefan Beller
2017-11-20 21:22 ` [PATCH 2/8] connect: move no_fork fallback to git_tcp_connect Jonathan Nieder
2017-11-20 21:23 ` [PATCH 3/8] connect: split git:// setup into a separate function Jonathan Nieder
2017-11-20 21:52 ` Brandon Williams
2017-11-20 22:04 ` Jonathan Nieder
2017-11-20 22:29 ` Brandon Williams
2017-11-20 21:25 ` [PATCH 4/8] connect: split ssh command line options into " Jonathan Nieder
2017-11-20 21:54 ` Brandon Williams
2017-11-20 22:09 ` Jonathan Nieder
2017-11-20 22:28 ` Brandon Williams [this message]
2017-11-20 22:19 ` [PATCH v4 " Jonathan Nieder
2017-11-20 21:26 ` [PATCH 5/8] connect: split ssh option computation to its own function Jonathan Nieder
2017-11-21 1:31 ` Junio C Hamano
2017-11-20 21:30 ` [PATCH 6/8] ssh: 'auto' variant to select between 'ssh' and 'simple' Jonathan Nieder
2017-11-20 22:25 ` Brandon Williams
2017-11-21 1:48 ` Junio C Hamano
2017-11-21 2:01 ` Jonathan Nieder
2017-11-20 21:30 ` [PATCH 7/8] ssh: 'simple' variant does not support -4/-6 Jonathan Nieder
2017-11-20 21:31 ` [PATCH 8/8] ssh: 'simple' variant does not support --port Jonathan Nieder
2017-11-20 22:32 ` [PATCH v3 0/8] Coping with unrecognized ssh wrapper scripts in GIT_SSH Brandon Williams
2017-11-22 0:00 ` Stefan Beller
2017-11-22 1:52 ` 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=20171120222820.GE92506@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.com \
--cc=segev208@gmail.com \
/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).