summaryrefslogtreecommitdiff
path: root/connect.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-08-06 15:37:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-06 15:37:43 -0700
commit125f6435b145ca0505130f0a9d7e4f465bce6c2f (patch)
tree40774add8f8740668da02393e48b104b88017401 /connect.c
parentMerge branch 'rs/git-blame-mapcar-mapc' into maint (diff)
parentgit: Wrong parsing of ssh urls with IPv6 literals ignores port (diff)
downloadtgif-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
Diffstat (limited to 'connect.c')
-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