circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-13 22:34:23 +00:00
Code Issues Projects Releases Wiki Activity

build: fetch cutover master before merge

Browse Source
This commit is contained in:
Thomas Adam
2026-07-13 09:00:01 +01:00
parent 0925c9846b
commit f80d3f6123
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/update-openbsd-and-portable.yml vendored
View File

@@ -143,9 +143,9 @@ jobs:
git remote add tmux-openbsd "../$CUTOVER_DIR" git remote add tmux-openbsd "../$CUTOVER_DIR"
fi fi
git fetch --no-tags tmux-openbsd git fetch --no-tags tmux-openbsd master:refs/remotes/tmux-openbsd/master
git switch 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 - name: Push portable repository
if: steps.cutover.outputs.changed == 'true' if: steps.cutover.outputs.changed == 'true'