From 83eacb3cf707d9df0afd4ad8bb53bf49a198df98 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Wed, 23 Apr 2025 12:20:09 +0000
Subject: [PATCH] fix(scripts/release): handle cherry-pick bot titles in check
 commit metadata (#17535)

---
 scripts/release/check_commit_metadata.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/scripts/release/check_commit_metadata.sh b/scripts/release/check_commit_metadata.sh
index f53de8e107430..1368425d00639 100755
--- a/scripts/release/check_commit_metadata.sh
+++ b/scripts/release/check_commit_metadata.sh
@@ -118,6 +118,23 @@ main() {
 				title2=${parts2[*]:2}
 			fi
 
+			# Handle cherry-pick bot, it turns "chore: foo bar (#42)" to
+			# "chore: foo bar (cherry-pick #42) (#43)".
+			if [[ ${title1} == *"(cherry-pick #"* ]]; then
+				title1=${title1%" ("*}
+				pr=${title1##*#}
+				pr=${pr%)}
+				title1=${title1%" ("*}
+				title1="${title1} (#${pr})"$'\n'
+			fi
+			if [[ ${title2} == *"(cherry-pick #"* ]]; then
+				title2=${title2%" ("*}
+				pr=${title2##*#}
+				pr=${pr%)}
+				title2=${title2%" ("*}
+				title2="${title2} (#${pr})"$'\n'
+			fi
+
 			if [[ ${title1} != "${title2}" ]]; then
 				log "Invariant failed, cherry-picked commits have different titles: \"${title1%$'\n'}\" != \"${title2%$'\n'}\", attempting to check commit body for cherry-pick information..."