From bc6d66432a70f942663c49cb2315c34f09f0effe Mon Sep 17 00:00:00 2001
From: Floweynt <50057682+Floweynt@users.noreply.github.com>
Date: Sun, 13 Sep 2026 12:32:55 -0500
Subject: [PATCH] fix again

---
 .github/workflows/diff-pr.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/diff-pr.yml b/.github/workflows/diff-pr.yml
index e363fc1..d8fbabb 100644
--- a/.github/workflows/diff-pr.yml
+++ b/.github/workflows/diff-pr.yml
@@ -17,12 +17,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
 
-      - name: worktree base for diff
+      - name: merge base branch
         run: |
+          git config user.email "ci@localhost"
+          git config user.name "CI"
           git fetch origin ${{ github.event.pull_request.base.ref }}
-          git worktree add "$RUNNER_TEMP/base" "origin/${{ github.event.pull_request.base.ref }}"
+          git merge --no-edit origin/${{ github.event.pull_request.base.ref }}
+
+      - name: worktree base for diff
+        run: git worktree add "$RUNNER_TEMP/base" "origin/${{ github.event.pull_request.base.ref }}"
 
       - name: build closures and render diff
         run: |