fix(mcp): fix git fetch into checked out branch error

brendan-kellam · claude · brendan-kellam · commit da11bf955868 · 2026-02-01T22:29:47.000-08:00
Can't fetch into a branch that's checked out. Instead, fetch
origin/main and push HEAD directly to main.

Co-Authored-By: Claude Opus 4.5 &lt;noreply@anthropic.com&gt;
diff --git a/.github/workflows/release-mcp.yml b/.github/workflows/release-mcp.yml
@@ -157,37 +157,27 @@ jobs:
           cd packages/mcp
           npm publish --provenance --access public
 
-      - name: Fast-forward main to temporary branch
+      - name: Push release commit to main
         env:
           GH_TOKEN: ${{ steps.generate_token.outputs.token }}
-          TEMP_BRANCH: ${{ steps.push_temp_branch.outputs.temp_branch }}
         run: |
-          # Fetch main branch
-          git fetch origin main:main
-          git checkout main
+          # Fetch latest main to check if fast-forward is possible
+          git fetch origin main
 
-          # Check if fast-forward is possible
-          if ! git merge-base --is-ancestor main "$TEMP_BRANCH"; then
+          # Check if fast-forward is possible (current HEAD must be ahead of origin/main)
+          if ! git merge-base --is-ancestor origin/main HEAD; then
             echo "❌ ERROR: Cannot fast-forward main branch to release commit"
             echo ""
             echo "This means new commits were pushed to main after the release process started."
             echo ""
             echo "Recent commits on main that caused the conflict:"
-            git log --oneline $TEMP_BRANCH..main | head -5
+            git log --oneline HEAD..origin/main | head -5
             exit 1
           fi
 
-          # Fast-forward main to release commit
-          git merge --ff-only "$TEMP_BRANCH"
-
-          echo "✓ Successfully fast-forwarded main to release commit"
-
-      - name: Push main
-        env:
-          GH_TOKEN: ${{ steps.generate_token.outputs.token }}
-        run: |
-          git push origin main
-          echo "Pushed main branch"
+          # Push current HEAD to main (fast-forward)
+          git push origin HEAD:main
+          echo "✓ Successfully pushed release commit to main"
 
       - name: Delete temporary branch
         if: always()
