add fallback function invocation to retry push if go-git push fails

Author: neel1996

git/git_fetch.go

@@ -11,6 +11,7 @@ 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
@@ -53,10 +54,10 @@ func FetchFromRemote(repo *git.Repository, remoteURL string, remoteBranch string
 	b := new(bytes.Buffer)
 	var fetchErr error
 	gitSSHAuth, sshErr := ssh.NewSSHAgentAuth("git")
+	w, _ := repo.Worktree()
 
 	if sshErr != nil {
 		logger.Log("Authentication method failed -> "+sshErr.Error(), global.StatusError)
-		w, _ := repo.Worktree()
 		if w == nil {
 			return &model.FetchResult{
 				Status:       "FETCH ERROR",
@@ -103,6 +104,10 @@ 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:       "FETCH ERROR",

git/git_pull.go

@@ -12,6 +12,7 @@ import (
 	"github.com/neel1996/gitconvex-server/utils"
 	"go/types"
 	"io"
+	"strings"
 )
 
 // windowsPull is used for pulling changes using the git client if the platform is windows
@@ -100,6 +101,10 @@ func PullFromRemote(repo *git.Repository, remoteURL string, remoteBranch string)
 				PulledItems: []*string{&msg},
 			}
 		} else {
+			if strings.Contains(pullErr.Error(), "ssh: handshake failed: ssh:") {
+				logger.Log("Pull failed. Retrying pull with git client", global.StatusWarning)
+				return windowsPull(w.Filesystem.Root(), remoteName, remoteBranch)
+			}
 			logger.Log(pullErr.Error(), global.StatusError)
 			return &model.PullResult{
 				Status:      "PULL ERROR",

git/git_push.go

@@ -10,6 +10,7 @@ import (
 	"github.com/neel1996/gitconvex-server/global"
 	"github.com/neel1996/gitconvex-server/utils"
 	"io"
+	"strings"
 )
 
 // windowsPush is used for pushing changes using the git client if the platform is windows
@@ -32,13 +33,14 @@ func windowsPush(repoPath string, remoteName string, branch string) string {
 // By default it will choose the current branch and pushes to the matching remote branch
 func PushToRemote(repo *git.Repository, remoteName string, remoteBranch string) string {
 	targetRefPsec := "refs/heads/" + remoteBranch + ":refs/heads/" + remoteBranch
+	w, _ := repo.Worktree()
+
 	b := new(bytes.Buffer)
 	sshAuth, sshErr := ssh.NewSSHAgentAuth("git")
 	logger.Log(fmt.Sprintf("Pushing changes to remote -> %s : %s", remoteName, targetRefPsec), global.StatusInfo)
 
 	if sshErr != nil {
 		logger.Log(fmt.Sprintf("Authentication failed -> %s", sshErr.Error()), global.StatusError)
-		w, _ := repo.Worktree()
 
 		if w == nil {
 			return "PUSH_FAILED"
@@ -63,6 +65,10 @@ func PushToRemote(repo *git.Repository, remoteName string, remoteBranch string)
 	})
 
 	if err != nil {
+		if strings.Contains(err.Error(), "ssh: handshake failed: ssh:") {
+			logger.Log("push failed. Retrying push with git client", global.StatusWarning)
+			return windowsPush(w.Filesystem.Root(), remoteName, remoteBranch)
+		}
 		logger.Log(fmt.Sprintf("Error occurred while pushing changes to -> %s : %s\n%s", remoteName, targetRefPsec, err.Error()), global.StatusError)
 		return "PUSH_FAILED"
 	} else {