From e1aa4334f899f87b183ef6d8a13eec8837029738 Mon Sep 17 00:00:00 2001
From: Antoine Tenart <atenart@kernel.org>
Date: Fri, 22 Jan 2021 22:39:15 +0100
Subject: [PATCH] root: move the remote guessing logic in its own function

Cosmetic patch moving the remote guessing logic in its own function for
readability (and enabling future changes to the logic). This patch
shouldn't change lab's behaviour in any way.

Signed-off-by: Antoine Tenart <atenart@kernel.org>
---
 cmd/root.go | 66 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/cmd/root.go b/cmd/root.go
index 896f50ca..4fc24e76 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -111,6 +111,41 @@ var (
 	forkRemote = ""
 )
 
+// Try to guess what should be the default remote.
+func guessDefaultRemote() string {
+	guess := ""
+
+	_, err := gitconfig.Local("remote.upstream.url")
+	if err == nil {
+		guess = "upstream"
+	}
+	_, err = gitconfig.Local("remote.origin.url")
+	if err == nil {
+		guess = "origin"
+	}
+
+	if guess == "" {
+		// use the remote tracked by the default branch if set
+		if remote, err := gitconfig.Local("branch.main.remote"); err == nil {
+			guess = remote
+		} else if remote, err = gitconfig.Local("branch.master.remote"); err == nil {
+			guess = remote
+		} else {
+			// use the first remote added to .git/config file, which, usually, is
+			// the one from which the repo was clonned
+			remotesStr, err := git.GetLocalRemotesFromFile()
+			if err == nil {
+				remotes := strings.Split(remotesStr, "\n")
+				// remotes format: remote.<name>.<url|fetch>
+				remoteName := strings.Split(remotes[0], ".")[1]
+				guess = remoteName
+			}
+		}
+	}
+
+	return guess
+}
+
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
@@ -118,38 +153,13 @@ func Execute() {
 	// Otherwise, skip it, since the info won't be used at all, also avoiding
 	// misleading error/warning messages about missing remote.
 	if git.InsideGitRepo() {
-		_, err := gitconfig.Local("remote.upstream.url")
-		if err == nil {
-			defaultRemote = "upstream"
-		}
-		_, err = gitconfig.Local("remote.origin.url")
-		if err == nil {
-			defaultRemote = "origin"
-		}
-
+		defaultRemote = guessDefaultRemote()
 		if defaultRemote == "" {
-			// use the remote tracked by the default branch if set
-			if remote, err := gitconfig.Local("branch.main.remote"); err == nil {
-				defaultRemote = remote
-			} else if remote, err = gitconfig.Local("branch.master.remote"); err == nil {
-				defaultRemote = remote
-			} else {
-				// use the first remote added to .git/config file, which, usually, is
-				// the one from which the repo was clonned
-				remotesStr, err := git.GetLocalRemotesFromFile()
-				if err == nil {
-					remotes := strings.Split(remotesStr, "\n")
-					// remotes format: remote.<name>.<url|fetch>
-					remoteName := strings.Split(remotes[0], ".")[1]
-					defaultRemote = remoteName
-				} else {
-					log.Println("No default remote found")
-				}
-			}
+			log.Println("No default remote found")
 		}
 
 		// Check if the user fork exists
-		_, err = gitconfig.Local("remote." + lab.User() + ".url")
+		_, err := gitconfig.Local("remote." + lab.User() + ".url")
 		if err == nil {
 			forkRemote = lab.User()
 		} else {