From 27c13036a0ef12e98d0d1cdeeebb15780e1c4189 Mon Sep 17 00:00:00 2001 From: Andrew Jeffree Date: Wed, 18 Dec 2019 10:01:06 +1100 Subject: [PATCH] Fix WriteGitCreds for BitBucket The default BitbucketBaseURL value if not set by the user is "https://api.bitbucket.org" which does not actually work with git. --- server/server.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/server.go b/server/server.go index 7a9c4f394..2e1c584bf 100644 --- a/server/server.go +++ b/server/server.go @@ -179,7 +179,13 @@ func NewServer(userConfig UserConfig, config Config) (*Server, error) { } } if userConfig.BitbucketUser != "" { - if err := events.WriteGitCreds(userConfig.BitbucketUser, userConfig.BitbucketToken, userConfig.BitbucketBaseURL, home, logger); err != nil { + // The default BitbucketBaseURL is https://api.bitbucket.org which can't actually be used for git + // so we overide it here only if it's that to be bitbucket.org + bitbucketBaseURL := userConfig.BitbucketBaseURL + if bitbucketBaseURL == "https://api.bitbucket.org" { + bitbucketBaseURL = "bitbucket.org" + } + if err := events.WriteGitCreds(userConfig.BitbucketUser, userConfig.BitbucketToken, bitbucketBaseURL, home, logger); err != nil { return nil, err } }