Merge branch 'rs/ipv6-ssh-url' into maint

* rs/ipv6-ssh-url: git: Wrong parsing of ssh urls with IPv6 literals ignores port
git-mirror · Aug 6, 2012 · 125f643 · 125f643
2 parents e597c43 + 7acf438
commit 125f643
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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