Merge branch 'rs/ipv6-ssh-url'

ssh:// URLs to IPv6 hosts with custom port number were parsed
incorrectly.

* rs/ipv6-ssh-url:
  git: Wrong parsing of ssh urls with IPv6 literals ignores port
This commit is contained in:
Junio C Hamano 2012-06-25 11:25:06 -07:00
Родитель dd39379a32 7acf438215
Коммит 8e4a819ac9
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

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