From: Mike Hommey <mh@glandium.org>
To: git@vger.kernel.org
Cc: gitster@pobox.com, tboegi@web.de
Subject: [PATCH v6 5/9] connect: group CONNECT_DIAG_URL handling code
Date: Tue, 17 May 2016 10:35:50 +0900 [thread overview]
Message-ID: <20160517013554.22578-6-mh@glandium.org> (raw)
In-Reply-To: <20160517013554.22578-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 4ce83f7..3a77b2f 100644
--- a/connect.c
+++ b/connect.c
@@ -708,7 +708,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");
@@ -778,20 +778,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.2.411.ga570dec.dirty
next prev parent reply other threads:[~2016-05-17 1:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-17 1:35 [PATCH v6 0/9] connect: various cleanups Mike Hommey
2016-05-17 1:35 ` [PATCH v6 1/9] connect: call get_host_and_port() earlier Mike Hommey
2016-05-20 20:58 ` Junio C Hamano
2016-05-20 22:14 ` Mike Hommey
2016-05-20 22:20 ` Junio C Hamano
2016-05-20 22:28 ` Mike Hommey
2016-05-17 1:35 ` [PATCH v6 2/9] connect: only match the host with core.gitProxy Mike Hommey
2016-05-20 21:48 ` Junio C Hamano
2016-05-20 22:30 ` Mike Hommey
2016-05-20 22:56 ` Junio C Hamano
2016-05-17 1:35 ` [PATCH v6 3/9] connect: fill the host header in the git protocol with the host and port variables Mike Hommey
2016-05-17 1:35 ` [PATCH v6 4/9] connect: make parse_connect_url() return separated host and port Mike Hommey
2016-05-17 1:35 ` Mike Hommey [this message]
2016-05-17 1:35 ` [PATCH v6 6/9] connect: make parse_connect_url() return the user part of the url as a separate value Mike Hommey
2016-05-17 1:35 ` [PATCH v6 7/9] connect: change the --diag-url output to separate user and host Mike Hommey
2016-05-17 1:35 ` [PATCH v6 8/9] connect: actively reject git:// urls with a user part Mike Hommey
2016-05-17 1:35 ` [PATCH v6 9/9] connect: move ssh command line preparation to a separate function Mike Hommey
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=20160517013554.22578-6-mh@glandium.org \
--to=mh@glandium.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tboegi@web.de \
/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).