diff options
author | TheDarkUndoing <38772798+TheDarkUndoing@users.noreply.github.com> | 2023-03-05 07:00:56 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-05 20:00:56 +0800 |
commit | 5483d97f73bf22ee4f8efddff246ed0433d75c6a (patch) | |
tree | cd675e1d3e06c8f1cfb8d2ddd9e66e456c6b3c59 /internal/gitutil | |
parent | 6fa552994a861bef34bab34c6cd7eeb7a46a007a (diff) |
gitutil: strip SSH port from submodule URL when rendering for HTML link (#7383)
Co-authored-by: Joe Chen <jc@unknwon.io>
Diffstat (limited to 'internal/gitutil')
-rw-r--r-- | internal/gitutil/submodule.go | 2 | ||||
-rw-r--r-- | internal/gitutil/submodule_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/internal/gitutil/submodule.go b/internal/gitutil/submodule.go index 73e08040..519a24f9 100644 --- a/internal/gitutil/submodule.go +++ b/internal/gitutil/submodule.go @@ -50,7 +50,7 @@ func InferSubmoduleURL(baseURL string, mod *git.Submodule) string { case "http", "https": raw = parsed.String() case "ssh": - raw = fmt.Sprintf("http://%s%s", parsed.Host, parsed.Path) + raw = fmt.Sprintf("http://%s%s", parsed.Hostname(), parsed.Path) default: return raw } diff --git a/internal/gitutil/submodule_test.go b/internal/gitutil/submodule_test.go index 53f48766..0ef60a0d 100644 --- a/internal/gitutil/submodule_test.go +++ b/internal/gitutil/submodule_test.go @@ -31,7 +31,7 @@ func TestInferSubmoduleURL(t *testing.T) { URL: "ssh://user@github.com:22/gogs/docs-api.git", Commit: "6b08f76a5313fa3d26859515b30aa17a5faa2807", }, - expURL: "http://github.com:22/gogs/docs-api/commit/6b08f76a5313fa3d26859515b30aa17a5faa2807", + expURL: "http://github.com/gogs/docs-api/commit/6b08f76a5313fa3d26859515b30aa17a5faa2807", }, { name: "SSH URL in SCP syntax", |