fix: avoid resetting fetch head when doing branch fetch unshallow (#4577

)
runatlantis · Nov 7, 2024 · d4247bc · d4247bc
1 parent 842def0
commit d4247bc
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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.