From bd613c704c0d74352d427ab32369310a04f5b721 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sat, 6 Nov 2021 07:23:32 +0100
Subject: Fix ipv6 parsing for builtin ssh server (#17561)

---
 integrations/git_helper_for_declarative_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'integrations')

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
 }
-- 
cgit v1.2.3