Try remain-on-tmp-branch

akirak · Sep 24, 2023 · bec2988 · bec2988
1 parent bfbf5b9
commit bec2988
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
@@ -35,15 +35,9 @@ jobs:
         # unused
         git config --add user.name 'github-actions[bot]'
         git config --add user.email '6270544+github-actions[bot]@users.noreply.github.com'
-        nix run github:emacs-twist/recipes-updater#forceUpdate \
+        nix run github:emacs-twist/recipes-updater/remain-on-tmp-branch#forceUpdate \
           --no-write-lock-file -- upstream/master
 
-    # A workaround to prevent peter-evans/create-pull-request from resetting the
-    # head here:
-    # <https://github.com/peter-evans/create-pull-request/blob/d806186ee3288c60a352af9852b6b18afbbfd87e/src/create-or-update-branch.ts#L178>
-    - name: Detach the head
-      run: git switch --detach `git rev-parse HEAD`
-
     - name: Create a pull request
       uses: peter-evans/create-pull-request@v5
       with: