[PATCH v8 5/9] connect: group CONNECT_DIAG_URL handling code
- From
Mike Hommey <mh@glandium.org>
- Date
- May 27, 2016, 02:27 UTC
- Message-ID
- <20160527022756.22904-6-mh@glandium.org>
- In-Reply-To
- <20160527022756.22904-1-mh@glandium.org>
Previous changes made both branches handling CONNECT_DIAG_URL identical. We can now remove one of those branches and have CONNECT_DIAG_URL be handled in one place.
Signed-off-by: Mike Hommey <mh@glandium.org> --- connect.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/connect.c b/connect.c index de7419e..4be06f4 100644 --- a/connect.c +++ b/connect.c @@ -701,7 +701,7 @@ struct child_process *git_connect(int fd[2], const char *url, signal(SIGCHLD, SIG_DFL); protocol = parse_connect_url(url, &host, &port, &path); - if ((flags & CONNECT_DIAG_URL) && (protocol != PROTO_SSH)) { + 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", host ? host : "NULL"); @@ -773,20 +773,6 @@ struct child_process *git_connect(int fd[2], const char *url, int putty = 0, tortoiseplink = 0; transport_check_allowed("ssh"); - 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", host ? host : "NULL"); - printf("Diag: port=%s\n", port ? port : "NONE"); - printf("Diag: path=%s\n", path ? path : "NULL"); - - free(host); - free(port); - free(path); - free(conn); - return NULL; - } - ssh = getenv("GIT_SSH_COMMAND"); if (!ssh) { const char *base;
-- 2.8.3