summaryrefslogtreecommitdiffstats
path: root/integrations/git_helper_for_declarative_test.go
diff options
context:
space:
mode:
authorWim <wim@42.be>2021-11-06 07:23:32 +0100
committerGitHub <noreply@github.com>2021-11-06 14:23:32 +0800
commitbd613c704c0d74352d427ab32369310a04f5b721 (patch)
tree56a2184ba9d11a9170fa7b37b601992e90d6b6be /integrations/git_helper_for_declarative_test.go
parent5e0cf4b82e10e72cd9754326e3183409afdb736c (diff)
downloadgitea-bd613c704c0d74352d427ab32369310a04f5b721.tar.gz
gitea-bd613c704c0d74352d427ab32369310a04f5b721.zip
Fix ipv6 parsing for builtin ssh server (#17561)
Diffstat (limited to 'integrations/git_helper_for_declarative_test.go')
-rw-r--r--integrations/git_helper_for_declarative_test.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/integrations/git_helper_for_declarative_test.go b/integrations/git_helper_for_declarative_test.go
index 9da5c05f94..71473ce464 100644
--- a/integrations/git_helper_for_declarative_test.go
+++ b/integrations/git_helper_for_declarative_test.go
@@ -13,6 +13,7 @@ import (
"os"
"path"
"path/filepath"
+ "strconv"
"strings"
"testing"
"time"
@@ -55,7 +56,7 @@ func createSSHUrl(gitPath string, u *url.URL) *url.URL {
u2 := *u
u2.Scheme = "ssh"
u2.User = url.User("git")
- u2.Host = fmt.Sprintf("%s:%d", setting.SSH.ListenHost, setting.SSH.ListenPort)
+ u2.Host = net.JoinHostPort(setting.SSH.ListenHost, strconv.Itoa(setting.SSH.ListenPort))
u2.Path = gitPath
return &u2
}