From 780e4bcaaa9b276a976dada84425e894a0911865 Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <oliver.drotbohm@broadcom.com>
Date: Sun, 14 Jul 2024 19:26:06 +0200
Subject: [PATCH] GH-704 - Attempt cherry-pick before creating the ticket.

---
 etc/create-backport-tickets.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/etc/create-backport-tickets.sh b/etc/create-backport-tickets.sh
index e557dba2..2050c9c4 100755
--- a/etc/create-backport-tickets.sh
+++ b/etc/create-backport-tickets.sh
@@ -13,21 +13,20 @@ number=$1
 # For each of the target versions
 for version in ${@:2}
 do
-	echo "gh issue create --title \"$title\" --body \"Back-port of $sourceGh.\" --label \"$labels\" --assignee \"@me\" --milestone \"$version\""
-	number=$(gh issue create --title "$title" --body "Back-port of $sourceGh." --label "$labels" --assignee "@me" --milestone "$version" | awk -F '/' '{print $NF}')
-	echo "New ticket number: $number"
-
 	# Turn 1.5.6 into 1.5.x
 	targetBranch="$(echo "$version" | grep -oE '^[0-9]+\.[0-9]+').x"
 
 	# Checkout target branch and cherry-pick commit
-
 	echo "Checking out branch $targetBranch"
 	git checkout $targetBranch
 
 	echo "Cherry-pick commit from $branch"
 	git cherry-pick $branch
 
+	echo "gh issue create --title \"$title\" --body \"Back-port of $sourceGh.\" --label \"$labels\" --assignee \"@me\" --milestone \"$version\""
+	number=$(gh issue create --title "$title" --body "Back-port of $sourceGh." --label "$labels" --assignee "@me" --milestone "$version" | awk -F '/' '{print $NF}')
+	echo "New ticket number: $number"
+
 	# Replace ticket reference with new one
 	targetGh="GH-$number"
 	expression="s/$sourceGh/$targetGh/g"