From d421b493144bee432c0716047f7d59d398193248 Mon Sep 17 00:00:00 2001
From: Luke Massa <lmassa@tripadvisor.com>
Date: Mon, 11 Dec 2023 19:45:05 -0500
Subject: [PATCH] fix: fetch before checking status (#3832)

* fix: fetch before checking status

* Switch to fetch
---
 server/events/working_dir.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/server/events/working_dir.go b/server/events/working_dir.go
index 7795740ac8..f6b9ed76aa 100644
--- a/server/events/working_dir.go
+++ b/server/events/working_dir.go
@@ -203,6 +203,15 @@ func (w *FileWorkspace) HasDiverged(cloneDir string) bool {
 		// we assume false here for 'branch' strategy.
 		return false
 	}
+
+	statusFetchCmd := exec.Command("git", "fetch")
+	statusFetchCmd.Dir = cloneDir
+	outputStatusFetch, err := statusFetchCmd.CombinedOutput()
+	if err != nil {
+		w.Logger.Warn("fetching repo has failed: %s", string(outputStatusFetch))
+		return false
+	}
+
 	// Check if remote main branch has diverged.
 	statusUnoCmd := exec.Command("git", "status", "--untracked-files=no")
 	statusUnoCmd.Dir = cloneDir