summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-25 11:25:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-25 11:25:06 -0700
commit8e4a819ac9979e35228775da8f85d2fae78f1da1 (patch)
tree360b90c33d34a6375f88ced095d97595014bd734
parentMerge branch 'jc/ustar-checksum-is-unsigned' (diff)
parentgit: Wrong parsing of ssh urls with IPv6 literals ignores port (diff)
downloadtgif-8e4a819ac9979e35228775da8f85d2fae78f1da1.tar.xz
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
-rw-r--r--connect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/connect.c b/connect.c
index 912cddeea8..41b7400aa9 100644
--- 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