Fix cherry-pick job for unmerged PRs (#56510)

microsoft · Nov 22, 2023 · 8caae93 · 8caae93
1 parent dcbfb0c
commit 8caae93
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/create-cherry-pick-pr.yml b/.github/workflows/create-cherry-pick-pr.yml
@@ -66,7 +66,7 @@ jobs:
             await exec.exec("git", ["config", "user.name", "TypeScript Bot"]);
             await exec.exec("git", ["switch", "--detach", `origin/${TARGET_BRANCH}`]);
             await exec.exec("git", ["switch", "-c", pickBranch]);
-            await exec.exec("git", ["cherry-pick", pr.data.merge_commit_sha]);
+            await exec.exec("git", ["cherry-pick", "-m", "-1", pr.data.merge_commit_sha]);
             await exec.exec("git", ["push", "--force", "--set-upstream", "origin", pickBranch]);
 
             const existingPulls = await github.rest.pulls.list({