fix: cloud branch exists sometimes not correctly work on some version…

…s of git
chriswalz · Jul 4, 2021 · 200289c · 200289c
1 parent c7879cd
commit 200289c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmd/git.go b/cmd/git.go
@@ -11,13 +11,13 @@ import (
 )
 
 func CloudBranchExists() bool {
-	msg, err := execCommand("git", "pull").CombinedOutput()
+	msg, err := execCommand("git", "diff", "@{u}").CombinedOutput()
 	if err != nil {
 		log.Debug().Err(err).Send()
 	}
 	// log.Println("msg:", string(msg))
 	// log.Println("err:", err)
-	return !strings.Contains(string(msg), "There is no tracking information for the current branch")
+	return !strings.Contains(string(msg), "fatal: no upstream configured for branch")
 }
 
 func CurrentBranch() string {