Skip to content

Commit 8caae93

Browse files
authored
Fix cherry-pick job for unmerged PRs (#56510)
1 parent dcbfb0c commit 8caae93

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/create-cherry-pick-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
await exec.exec("git", ["config", "user.name", "TypeScript Bot"]);
6767
await exec.exec("git", ["switch", "--detach", `origin/${TARGET_BRANCH}`]);
6868
await exec.exec("git", ["switch", "-c", pickBranch]);
69-
await exec.exec("git", ["cherry-pick", pr.data.merge_commit_sha]);
69+
await exec.exec("git", ["cherry-pick", "-m", "-1", pr.data.merge_commit_sha]);
7070
await exec.exec("git", ["push", "--force", "--set-upstream", "origin", pickBranch]);
7171
7272
const existingPulls = await github.rest.pulls.list({

0 commit comments

Comments
 (0)