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 <m...@glandium.org>
---
 connect.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/connect.c b/connect.c
index 3428149..8813f90 100644
--- a/connect.c
+++ b/connect.c
@@ -691,7 +691,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");
@@ -761,20 +761,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.ga331486

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to