mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'tb/connect-ipv6-parse-fix'
An earlier update to the parser that disects an address broke an address, followed by a colon, followed by an empty string (instead of the port number). * tb/connect-ipv6-parse-fix: connect.c: ignore extra colon after hostname
This commit is contained in:
commit
9718c7c0c2
|
@ -310,6 +310,8 @@ static void get_host_and_port(char **host, const char **port)
|
|||
if (end != colon + 1 && *end == '\0' && 0 <= portnr && portnr < 65536) {
|
||||
*colon = 0;
|
||||
*port = colon + 1;
|
||||
} else if (!colon[1]) {
|
||||
*colon = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -576,13 +576,16 @@ do
|
|||
do
|
||||
for h in host user@host user@[::1] user@::1
|
||||
do
|
||||
test_expect_success "fetch-pack --diag-url $p://$h/$r" '
|
||||
check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
|
||||
'
|
||||
# "/~" -> "~" conversion
|
||||
test_expect_success "fetch-pack --diag-url $p://$h/~$r" '
|
||||
check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
|
||||
'
|
||||
for c in "" :
|
||||
do
|
||||
test_expect_success "fetch-pack --diag-url $p://$h$c/$r" '
|
||||
check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
|
||||
'
|
||||
# "/~" -> "~" conversion
|
||||
test_expect_success "fetch-pack --diag-url $p://$h$c/~$r" '
|
||||
check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
|
||||
'
|
||||
done
|
||||
done
|
||||
for h in host User@host User@[::1]
|
||||
do
|
||||
|
|
|
@ -387,14 +387,17 @@ do
|
|||
done
|
||||
|
||||
#with ssh:// scheme
|
||||
test_expect_success 'clone ssh://host.xz/home/user/repo' '
|
||||
test_clone_url "ssh://host.xz/home/user/repo" host.xz "/home/user/repo"
|
||||
'
|
||||
|
||||
# from home directory
|
||||
test_expect_success 'clone ssh://host.xz/~repo' '
|
||||
test_clone_url "ssh://host.xz/~repo" host.xz "~repo"
|
||||
#ignore trailing colon
|
||||
for tcol in "" :
|
||||
do
|
||||
test_expect_success "clone ssh://host.xz$tcol/home/user/repo" '
|
||||
test_clone_url "ssh://host.xz$tcol/home/user/repo" host.xz /home/user/repo
|
||||
'
|
||||
# from home directory
|
||||
test_expect_success "clone ssh://host.xz$tcol/~repo" '
|
||||
test_clone_url "ssh://host.xz$tcol/~repo" host.xz "~repo"
|
||||
'
|
||||
done
|
||||
|
||||
# with port number
|
||||
test_expect_success 'clone ssh://host.xz:22/home/user/repo' '
|
||||
|
@ -407,9 +410,9 @@ test_expect_success 'clone ssh://host.xz:22/~repo' '
|
|||
'
|
||||
|
||||
#IPv6
|
||||
for tuah in ::1 [::1] user@::1 user@[::1] [user@::1]
|
||||
for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1] [user@::1]:
|
||||
do
|
||||
ehost=$(echo $tuah | tr -d "[]")
|
||||
ehost=$(echo $tuah | sed -e "s/1]:/1]/ "| tr -d "[]")
|
||||
test_expect_success "clone ssh://$tuah/home/user/repo" "
|
||||
test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo
|
||||
"
|
||||
|
|
Loading…
Reference in a new issue