From d4247bc0691ef853f8afcc24ca4f9d1df8561e7b Mon Sep 17 00:00:00 2001
From: Gusts Jonasts <101050452+0x0013@users.noreply.github.com>
Date: Thu, 7 Nov 2024 16:32:39 +0200
Subject: [PATCH] fix: avoid resetting fetch head when doing branch fetch
 unshallow (#4577)

---
 server/events/working_dir.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/events/working_dir.go b/server/events/working_dir.go
index c2e56d8dc..f77378a2a 100644
--- a/server/events/working_dir.go
+++ b/server/events/working_dir.go
@@ -353,6 +353,12 @@ func (w *FileWorkspace) mergeToBaseBranch(logger logging.SimpleLogging, c wrappe
 		if err := w.wrappedGit(logger, c, "fetch", "--unshallow"); err != nil {
 			return err
 		}
+
+		// fetch once more, otherwise `FETCH_HEAD` was reset to base when we ran
+		// fetch --unshallow
+		if err := w.wrappedGit(logger, c, "fetch", fetchRemote, fetchRef); err != nil {
+			return err
+		}
 	}
 
 	// We use --no-ff because we always want there to be a merge commit.