Skip to content

Commit d1550e9

Browse files
authored
Merge pull request #1529 from NVIDIA/fix/backport-merge-commit-handling
fix: handle merge commits in backport bot with -m 1
2 parents 40903ce + 289854d commit d1550e9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/scripts/backport.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ for (const targetBranch of branches) {
7070
const commitMessage = commit.commit.message.split('\n')[0];
7171
core.info(`Cherry-picking commit ${i + 1}/${commits.length}: ${commitSha.substring(0, 7)} - ${commitMessage}`);
7272
try {
73-
execSync(`git cherry-pick -x ${commitSha}`, {
73+
execSync(`git cherry-pick -m 1 -x ${commitSha}`, {
7474
encoding: 'utf-8',
7575
stdio: 'pipe'
7676
});

0 commit comments

Comments
 (0)