Update squash-pr.yml

Author: hangfei

.github/workflows/squash-pr.yml

@@ -7,24 +7,21 @@ on:
     types:
       - labeled
 
-# Grant permission to write to the repository
 permissions:
   contents: write
   pull-requests: read
 
 jobs:
   squash:
-    # Only run if the 'squash-and-merge' label was added
     if: github.event.label.name == 'squash-and-merge'
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout PR Branch
         uses: actions/checkout@v4
         with:
-          # Check out the head of the PR
-          ref: ${{ github.event.pull_request.head.sha }}
-          # Fetch all history so we can rebase
+          # CORRECT: Check out the branch name, not the SHA
+          ref: ${{ github.event.pull_request.head.ref }}
           fetch-depth: 0
 
       - name: Configure Git
@@ -34,21 +31,16 @@ jobs:
 
       - name: Squash Commits
         run: |
-          # The PR's target branch (e.g., 'main' or 'develop')
+          set -e # Exit on error
           BASE_BRANCH=${{ github.event.pull_request.base.ref }}
-          
-          # Get the commit hash of the merge base
           MERGE_BASE=$(git merge-base origin/$BASE_BRANCH HEAD)
-          
           echo "Squashing commits down to the merge base: $MERGE_BASE"
-          
-          # Perform the soft reset to un-commit changes
           git reset --soft $MERGE_BASE
-          
-          # Commit all the changes as a single commit using the PR title
-          git commit -m "${{ github.event.pull_request.title }}"
+          # Use the PR title and body for the commit message
+          git commit -m "${{ github.event.pull_request.title }}" -m "${{ github.event.pull_request.body }}"
 
       - name: Force-Push to PR Branch
         run: |
-          # Push the new squashed commit, overwriting the previous history
-          git push --force
+          # CORRECT: Explicitly specify the branch to push to
+          BRANCH_NAME=${{ github.event.pull_request.head.ref }}
+          git push --force origin HEAD:$BRANCH_NAME