From 27f3d62d02b39b618f2bf34cd5f30d05b5bf1a02 Mon Sep 17 00:00:00 2001 From: William Martin Date: Fri, 5 Apr 2024 12:23:47 +0200 Subject: [PATCH] Remove naked returns from git ParseURL --- git/url.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/git/url.go b/git/url.go index 1a3e97fd6..05517f9b3 100644 --- a/git/url.go +++ b/git/url.go @@ -26,7 +26,7 @@ func isPossibleProtocol(u string) bool { } // ParseURL normalizes git remote urls -func ParseURL(rawURL string) (u *url.URL, err error) { +func ParseURL(rawURL string) (*url.URL, error) { if !isPossibleProtocol(rawURL) && strings.ContainsRune(rawURL, ':') && // not a Windows path @@ -35,9 +35,9 @@ func ParseURL(rawURL string) (u *url.URL, err error) { rawURL = "ssh://" + strings.Replace(rawURL, ":", "/", 1) } - u, err = url.Parse(rawURL) + u, err := url.Parse(rawURL) if err != nil { - return + return nil, err } if u.Scheme == "git+ssh" { @@ -49,7 +49,7 @@ func ParseURL(rawURL string) (u *url.URL, err error) { } if u.Scheme != "ssh" { - return + return u, nil } if strings.HasPrefix(u.Path, "//") { @@ -60,5 +60,5 @@ func ParseURL(rawURL string) (u *url.URL, err error) { u.Host = u.Host[0:idx] } - return + return u, nil }