From 3e0ed6ffeeb6e6c31d8080d4db485c072570b5c4 Mon Sep 17 00:00:00 2001 From: Sahil Ahuja Date: Mon, 1 Jun 2026 08:54:46 +0530 Subject: [PATCH] fix(release): rebase tap clone before push to avoid non-fast-forward The "Update Homebrew tap" step cloned homebrew-tap, committed the new formula, and pushed with no reconciliation. When the tap's main advanced between clone and push (concurrent writers), git rejected the push as a non-fast-forward, failing the release after the GitHub Release had already been published. Insert `git pull --rebase --autostash` before the push so the formula commit is rebased onto the current remote tip. --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a8c398..a045d1f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -133,4 +133,8 @@ jobs: git config user.email "github-actions[bot]@users.noreply.github.com" git add Formula/wt.rb git commit -m "wt v${version}" + # The tap's main may have advanced since the clone (concurrent writers). + # Rebase onto the current remote tip before pushing to avoid a + # non-fast-forward rejection. + git pull --rebase --autostash git push