diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:37:43 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:37:43 -0700 |
commit | 125f6435b145ca0505130f0a9d7e4f465bce6c2f (patch) | |
tree | 40774add8f8740668da02393e48b104b88017401 | |
parent | e597c43de2eeaffc7e0a01f2e5900acfa95f50c5 (diff) | |
parent | 7acf438215d1b0e8e47a707f3585de8486a2e5fe (diff) | |
download | git-125f6435b145ca0505130f0a9d7e4f465bce6c2f.tar.gz git-125f6435b145ca0505130f0a9d7e4f465bce6c2f.tar.xz |
Merge branch 'rs/ipv6-ssh-url' into maint
* rs/ipv6-ssh-url:
git: Wrong parsing of ssh urls with IPv6 literals ignores port
-rw-r--r-- | connect.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |