Merge branch 'jn/block-sha1' into maint

diff --git a/connect.c b/connect.c
index 912cddeea8c4f09ec523ce19e677358c84eda9b7..41b7400aa92d7c07db269de9658b9f961db9becf 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -536,7 +536,7 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
         * Add support for ssh port: ssh://host.xy:<port>/...
         */
        if (protocol == PROTO_SSH && host != url)
-               port = get_port(host);
+               port = get_port(end);
 
        if (protocol == PROTO_GIT) {
                /* These underlying connection commands die() if they