ci: fix PR checkout (take 4)

radashi-org · Aug 15, 2024 · a8c759b · a8c759b
1 parent 4179148
commit a8c759b
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/scripts/checkout-pr.sh b/scripts/checkout-pr.sh
@@ -6,12 +6,9 @@ set -x
 git remote add pr $PR_REPO_URL
 git fetch pr "$PR_HEAD_REF"
 
-# Fetch the base commit
-BASE_COMMIT=$(git merge-base HEAD "pr/$PR_HEAD_REF")
-git fetch origin $BASE_COMMIT
-
 # Import changes from the PR into the current branch without committing
-git cherry-pick -n $BASE_COMMIT.."$PR_HEAD_REF" -X theirs
+BASE_COMMIT=$(git merge-base HEAD "pr/$PR_HEAD_REF")
+git cherry-pick -n "$BASE_COMMIT..pr/$PR_HEAD_REF" -X theirs
 
 # List the affected files for debugging purposes
 git diff --name-status --staged