From f80d3f612392870cbd431a1d0fad3c315c035095 Mon Sep 17 00:00:00 2001
From: Thomas Adam <thomas.adam22@gmail.com>
Date: Mon, 13 Jul 2026 09:00:01 +0100
Subject: [PATCH] build: fetch cutover master before merge

---
 .github/workflows/update-openbsd-and-portable.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-openbsd-and-portable.yml b/.github/workflows/update-openbsd-and-portable.yml
index f79d17545..003a0318b 100644
--- a/.github/workflows/update-openbsd-and-portable.yml
+++ b/.github/workflows/update-openbsd-and-portable.yml
@@ -143,9 +143,9 @@ jobs:
             git remote add tmux-openbsd "../$CUTOVER_DIR"
           fi
 
-          git fetch --no-tags tmux-openbsd
+          git fetch --no-tags tmux-openbsd master:refs/remotes/tmux-openbsd/master
           git switch master
-          git merge --no-ff --log tmux-openbsd/master
+          git merge --no-ff --log refs/remotes/tmux-openbsd/master
 
       - name: Push portable repository
         if: steps.cutover.outputs.changed == 'true'