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

* rs/ipv6-ssh-url:
  git: Wrong parsing of ssh urls with IPv6 literals ignores port
maint
Junio C Hamano 2012-08-06 15:37:43 -07:00
commit 125f6435b1
1 changed files with 1 additions and 1 deletions

View File

@ -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