consistently use 'origin' over 'base' or 'remote'

Author: karolzwolak

pkg/gui/controllers/remotes_controller.go

@@ -220,19 +220,19 @@ var urlRegex = regexp.MustCompile(`^(git@[^:]+:|ssh://[^/]+/|https?://[^/]+/)([^
 
 // Rewrites a Git remote URL to use the given fork username,
 // keeping the repo name and host intact. Supports SCP-like SSH, SSH URL style, and HTTPS.
-func replaceForkUsername(remoteUrl, forkUsername string) (string, error) {
+func replaceForkUsername(originUrl, forkUsername string) (string, error) {
 	if forkUsername == "" {
 		return "", errors.New("fork username cannot be empty")
 	}
-	if remoteUrl == "" {
+	if originUrl == "" {
 		return "", errors.New("remote URL cannot be empty")
 	}
 
-	if urlRegex.MatchString(remoteUrl) {
-		return urlRegex.ReplaceAllString(remoteUrl, "${1}"+forkUsername+"/$3$4"), nil
+	if urlRegex.MatchString(originUrl) {
+		return urlRegex.ReplaceAllString(originUrl, "${1}"+forkUsername+"/$3$4"), nil
 	}
 
-	return "", fmt.Errorf("unsupported or invalid remote URL: %s", remoteUrl)
+	return "", fmt.Errorf("unsupported or invalid remote URL: %s", originUrl)
 }
 
 func (self *RemotesController) getOrigin() *models.Remote {
@@ -255,7 +255,7 @@ func (self *RemotesController) hasOriginRemote() func() *types.DisabledReason {
 }
 
 func (self *RemotesController) addFork() error {
-	baseRemote := self.getOrigin()
+	origin := self.getOrigin()
 
 	self.c.Prompt(types.PromptOpts{
 		Title: self.c.Tr.AddForkRemoteUsername,
@@ -267,8 +267,8 @@ func (self *RemotesController) addFork() error {
 				forkUsername = parts[0]
 				branchToCheckout = parts[1]
 			}
-			baseUrl := baseRemote.Urls[0]
-			remoteUrl, err := replaceForkUsername(baseUrl, forkUsername)
+			originUrl := origin.Urls[0]
+			remoteUrl, err := replaceForkUsername(originUrl, forkUsername)
 			if err != nil {
 				return err
 			}