Skip to content

Commit

Permalink
Merge branch 'rs/ipv6-ssh-url'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Jun 25, 2012
2 parents dd39379 + 7acf438 commit 8e4a819
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8e4a819

Please sign in to comment.