From 796e8e4e18ea1d84d93731cb1a30e9aa7fecd764 Mon Sep 17 00:00:00 2001
From: Zach <3724288+zedkipp@users.noreply.github.com>
Date: Thu, 2 Apr 2026 10:23:31 -0600
Subject: [PATCH] feat: use -x option in backport script to improve tracability
 (#23984)

Add `-x` to backport script `git cherry-pick` command to include a
commit message reference to the original commit. This makes it easier to
trace where a cherry picked commit actually came from.
---
 scripts/backport-pr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/backport-pr.sh b/scripts/backport-pr.sh
index da370220c9..2e98284965 100755
--- a/scripts/backport-pr.sh
+++ b/scripts/backport-pr.sh
@@ -96,7 +96,7 @@ git checkout -b "$backport_branch" "origin/${release_branch}"
 
 # Cherry-pick the merge commit.
 log "Cherry-picking ${merge_commit}..."
-if ! git cherry-pick "$merge_commit"; then
+if ! git cherry-pick -x "$merge_commit"; then
 	log ""
 	log "Cherry-pick failed due to conflicts."
 	log "Resolve the conflicts, then run:"