From affcd4216ddfe9f22878983b958c486c2ebbb424 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Thu, 20 Nov 2025 21:24:32 +0100
Subject: [PATCH] [no-relnote] Update cherrypick action

See https://github.com/NVIDIA/k8s-device-plugin/pull/1529

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 .github/scripts/backport.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/backport.js b/.github/scripts/backport.js
index 06b59f09c..4964f76d8 100644
--- a/.github/scripts/backport.js
+++ b/.github/scripts/backport.js
@@ -70,7 +70,7 @@ for (const targetBranch of branches) {
       const commitMessage = commit.commit.message.split('\n')[0];
       core.info(`Cherry-picking commit ${i + 1}/${commits.length}: ${commitSha.substring(0, 7)} - ${commitMessage}`);
       try {
-        execSync(`git cherry-pick -x ${commitSha}`, { 
+        execSync(`git cherry-pick -m 1 -x ${commitSha}`, { 
           encoding: 'utf-8',
           stdio: 'pipe'
         });