fix remote branch checkout error (resolves #112)

Author: neel1996

git/git_branch_checkout.go

@@ -3,48 +3,55 @@ package git
 import (
 	"fmt"
 	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/neel1996/gitconvex-server/global"
 	"strings"
 )
 
+// intermediateFetch performs a remote fetch if the selected checkout branch is a remote branch
+func intermediateFetch(repo *git.Repository, branchName string) {
+	logger.Log("Fetching from remote for remote branch -> "+branchName, global.StatusInfo)
+	remoteChan := make(chan RemoteDataModel)
+	go RemoteData(repo, remoteChan)
+	remoteData := <-remoteChan
+	remoteURL := remoteData.RemoteURL
+	FetchFromRemote(repo, *remoteURL[0], branchName)
+}
+
 // CheckoutBranch checks out the branchName received as argument
 func CheckoutBranch(repo *git.Repository, branchName string) string {
 	var isRemoteBranch bool
+	var referenceBranchName string
+
 	logger := global.Logger{}
 	w, _ := repo.Worktree()
 
 	if strings.Contains(branchName, "remotes/") {
 		splitRef := strings.Split(branchName, "/")
-		branchName = "refs/heads/" + splitRef[len(splitRef)-1]
+		branchName = splitRef[len(splitRef)-1]
+		referenceBranchName = "refs/heads/" + branchName
 		isRemoteBranch = true
 	} else {
-		branchName = "refs/heads/" + branchName
+		referenceBranchName = "refs/heads/" + branchName
 	}
 
 	// If the branch is a remote branch then a remote fetch will be performed and then the branch checkout will be initiated
 	if isRemoteBranch {
 		logger.Log(fmt.Sprintf("Branch - %s is a remote branch\nTrying with intermediate remote fetch!", branchName), global.StatusWarning)
-		fetchErr := repo.Fetch(&git.FetchOptions{
-			RefSpecs: []config.RefSpec{config.RefSpec(branchName + ":" + branchName)},
-		})
-		if fetchErr != nil {
-			logger.Log("Remote fetch failed -> "+fetchErr.Error(), global.StatusWarning)
-		}
+		intermediateFetch(repo, branchName)
 
 		checkoutErr := w.Checkout(&git.CheckoutOptions{
-			Branch: plumbing.ReferenceName(branchName),
+			Branch: plumbing.ReferenceName(referenceBranchName),
 			Force:  true,
 		})
 		if checkoutErr != nil {
-			logger.Log(checkoutErr.Error(), global.StatusError)
+			logger.Log("Checkout failed - "+checkoutErr.Error(), global.StatusError)
 			return global.BranchCheckoutError
 		}
 	}
 
 	checkoutErr := w.Checkout(&git.CheckoutOptions{
-		Branch: plumbing.ReferenceName(branchName),
+		Branch: plumbing.ReferenceName(referenceBranchName),
 		Keep:   true,
 	})
 	if checkoutErr != nil {

git/git_fetch.go

@@ -11,7 +11,6 @@ import (
 	"github.com/neel1996/gitconvex-server/graph/model"
 	"github.com/neel1996/gitconvex-server/utils"
 	"io"
-	"strings"
 )
 
 // windowsFetch is used for fetching changes using the git client if the platform is windows
@@ -21,7 +20,8 @@ func windowsFetch(repoPath string, remoteName string, branch string) *model.Fetc
 	if remoteName == "" && branch == "" {
 		args = []string{"fetch"}
 	} else {
-		args = []string{"fetch", remoteName, branch}
+		branchReference := branch + ":" + branch
+		args = []string{"fetch", remoteName, branchReference}
 	}
 	cmd := utils.GetGitClient(repoPath, args)
 	cmdStr, cmdErr := cmd.Output()
@@ -34,7 +34,7 @@ func windowsFetch(repoPath string, remoteName string, branch string) *model.Fetc
 			FetchedItems: nil,
 		}
 	} else {
-		logger.Log(fmt.Sprintf("Changes fetched from remote - %s -> %s", remoteName, cmdStr), global.StatusInfo)
+		logger.Log(fmt.Sprintf("Changes fetched from remote - %s\n%s", remoteName, cmdStr), global.StatusInfo)
 
 		msg := fmt.Sprintf("Changes fetched from remote %v", remoteName)
 		return &model.FetchResult{
@@ -104,15 +104,9 @@ func FetchFromRemote(repo *git.Repository, remoteURL string, remoteBranch string
 				FetchedItems: nil,
 			}
 		} else {
-			if strings.Contains(fetchErr.Error(), "ssh: handshake failed: ssh:") {
-				logger.Log("Fetch failed. Retrying fetch with git client", global.StatusWarning)
-				return windowsFetch(w.Filesystem.Root(), remoteName, remoteBranch)
-			}
 			logger.Log(fetchErr.Error(), global.StatusError)
-			return &model.FetchResult{
-				Status:       global.FetchFromRemoteError,
-				FetchedItems: nil,
-			}
+			logger.Log("Fetch failed. Retrying fetch with git client", global.StatusWarning)
+			return windowsFetch(w.Filesystem.Root(), remoteName, remoteBranch)
 		}
 
 	} else {

git/git_remote_data.go

@@ -37,14 +37,13 @@ func RemoteData(repo *git.Repository, remoteChan chan RemoteDataModel) {
 		var rUrl []*string
 		for _, i := range remote {
 			for _, tempUrl := range i.Config().URLs {
+				logger.Log(fmt.Sprintf("Available remotes in repo : \n%v", tempUrl), global.StatusInfo)
 				rUrl = append(rUrl, &tempUrl)
 			}
 		}
 		return rUrl
 	}()
 
-	logger.Log(fmt.Sprintf("Available remotes in repo : \n%v", remoteURL), global.StatusInfo)
-
 	if len(remoteURL) == 0 {
 		nilRemote := "No Remote Host Available"
 		nilRemoteURL := ""