From 9d61f024f07b3ddb287274c99b60822fc62686b0 Mon Sep 17 00:00:00 2001
From: Jonathan Maple <jmaple@ciq.com>
Date: Wed, 25 Jun 2025 12:51:10 -0400
Subject: [PATCH 1/3] [CLK REBASE] Add intendend execution plan print

If for whatever reason the execution fails its annoying to figure out
what the remaining commands need to be this prefills them out so if it
fails its easy to pick up upon failure.

Future work: Self Healing
---
 lt_rebase_merge.sh | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/lt_rebase_merge.sh b/lt_rebase_merge.sh
index 883f38c..4641a6e 100755
--- a/lt_rebase_merge.sh
+++ b/lt_rebase_merge.sh
@@ -60,10 +60,23 @@ if ! [[ $NEW_GKH_TAG =~ $NVR_REGEX ]]; then # check if NEW_GKH_TAG matches the r
   exit 1
 fi
 NEW_CIQ_TAG="ciq_kernel-${NEW_GKH_TAG}-1"
-
-
 # merge PR branch into next branch
 set +x
+
+echo "Commands expected to run (This is in the even it fails during the run)"
+echo "git checkout $NEXT_BRANCH"
+echo "git pull origin $NEXT_BRANCH"
+echo "git merge --ff-only $PR_BRANCH"
+echo "git push origin $NEXT_BRANCH"
+echo "git branch -m $TARGET_BRANCH $PAST_VERSION_BRANCH"
+echo "git push origin :$TARGET_BRANCH $PAST_VERSION_BRANCH"
+echo "git push origin -u $PAST_VERSION_BRANCH"
+echo "git branch -m $NEXT_BRANCH $TARGET_BRANCH"
+echo "git push origin :$NEXT_BRANCH $TARGET_BRANCH"
+echo "git push origin -u $TARGET_BRANCH"
+echo "git tag $NEW_CIQ_TAG $TARGET_BRANCH"
+echo "git push origin $NEW_CIQ_TAG"
+
 echo "git checkout $NEXT_BRANCH"
 git checkout $NEXT_BRANCH
 if [ $? -ne 0 ]; then

From 40dff86f9c870bc9999ccebaa64ee937d6c6d702 Mon Sep 17 00:00:00 2001
From: Jonathan Maple <jmaple@ciq.com>
Date: Wed, 25 Jun 2025 15:18:43 -0400
Subject: [PATCH 2/3] [LTRM] Add deletion of remote PR branch

---
 lt_rebase_merge.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lt_rebase_merge.sh b/lt_rebase_merge.sh
index 4641a6e..412c3a4 100755
--- a/lt_rebase_merge.sh
+++ b/lt_rebase_merge.sh
@@ -105,6 +105,15 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
+echo "Delete PR branch ${PR_BRANCH} locally and remotely"
+echo "git push origin :${PR_BRANCH}"
+git push origin :"${PR_BRANCH}"
+if [ $? -ne 0 ]; then
+  echo "Failed to delete ${PR_BRANCH} remotely."
+  exit 1
+fi
+
+
 echo "git branch -m $TARGET_BRANCH $PAST_VERSION_BRANCH"
 git branch -m $TARGET_BRANCH $PAST_VERSION_BRANCH
 if [ $? -ne 0 ]; then

From 95b8740960c0eac368774491fc78d746ecd4f00b Mon Sep 17 00:00:00 2001
From: Jonathan Maple <jmaple@ciq.com>
Date: Wed, 25 Jun 2025 15:25:18 -0400
Subject: [PATCH 3/3] [LTRM] Shell Check changes

Includes PR Copilot suggestions, mostly just some minor grammar and
print safety checks not identified by shellcheck.
---
 lt_rebase_merge.sh | 71 +++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/lt_rebase_merge.sh b/lt_rebase_merge.sh
index 412c3a4..c760537 100755
--- a/lt_rebase_merge.sh
+++ b/lt_rebase_merge.sh
@@ -12,19 +12,19 @@ if [ -z "$PR_BRANCH" ] || [ -z "$TARGET_BRANCH" ]; then
 fi
 
 # Check if all branches exist
-git show-ref --verify --quiet refs/heads/$PR_BRANCH
+git show-ref --verify --quiet refs/heads/"${PR_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Branch ${PR_BRANCH} does not exist."
   exit 1
 fi
 
-git show-ref --verify --quiet refs/heads/$TARGET_BRANCH
+git show-ref --verify --quiet refs/heads/"${TARGET_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Branch ${TARGET_BRANCH} does not exist."
   exit 1
 fi
 
-git show-ref --verify --quiet refs/heads/$NEXT_BRANCH
+git show-ref --verify --quiet refs/heads/"${NEXT_BRANCH}"
 if [ $? -ne 0 ] ; then
   echo "Branch ${NEXT_BRANCH} does not exist."
   exit 1
@@ -32,10 +32,10 @@ fi
 
 
 #collect all static data fire before making alterations to the local and remote repositories
-PAST_VERSION=$(git describe --tags --abbrev=0 $TARGET_BRANCH | awk -F '-' '{print $2}')
+PAST_VERSION=$(git describe --tags --abbrev=0 "${TARGET_BRANCH}" | awk -F '-' '{print $2}')
 if [ -z "$PAST_VERSION" ]; then
   echo "Failed to get a CIQ Tag from ${TARGET_BRANCH}."
-  echo "LastTag: $(git describe --tags --abbrev=0 $TARGET_BRANCH)"
+  echo "LastTag: $(git describe --tags --abbrev=0 "${TARGET_BRANCH}")"
   exit 1
 fi
 # Check if PAST_VERSION matches the regex
@@ -48,10 +48,10 @@ PAST_VERSION_BRANCH="ciq-${PAST_VERSION}"
 echo "PAST_VERSION: $PAST_VERSION"
 echo "PAST_VERSION_BRANCH: $PAST_VERSION_BRANCH"
 
-NEW_GKH_TAG=$(git describe --tags --abbrev=0 $PR_BRANCH | sed 's/^.//g')
+NEW_GKH_TAG=$(git describe --tags --abbrev=0 "${PR_BRANCH}" | sed 's/^.//g')
 if [ -z "$NEW_GKH_TAG" ]; then
   echo "Failed to get a GKH Tag from ${PR_BRANCH}."
-  echo "LastTag: $(git describe --tags --abbrev=0 $PR_BRANCH)"
+  echo "LastTag: $(git describe --tags --abbrev=0 "${PR_BRANCH}")"
   exit 1
 fi
 # Check if NEW_GKH_TAG matches the regex
@@ -63,43 +63,43 @@ NEW_CIQ_TAG="ciq_kernel-${NEW_GKH_TAG}-1"
 # merge PR branch into next branch
 set +x
 
-echo "Commands expected to run (This is in the even it fails during the run)"
-echo "git checkout $NEXT_BRANCH"
-echo "git pull origin $NEXT_BRANCH"
-echo "git merge --ff-only $PR_BRANCH"
-echo "git push origin $NEXT_BRANCH"
-echo "git branch -m $TARGET_BRANCH $PAST_VERSION_BRANCH"
-echo "git push origin :$TARGET_BRANCH $PAST_VERSION_BRANCH"
-echo "git push origin -u $PAST_VERSION_BRANCH"
-echo "git branch -m $NEXT_BRANCH $TARGET_BRANCH"
-echo "git push origin :$NEXT_BRANCH $TARGET_BRANCH"
-echo "git push origin -u $TARGET_BRANCH"
-echo "git tag $NEW_CIQ_TAG $TARGET_BRANCH"
-echo "git push origin $NEW_CIQ_TAG"
+echo "Commands expected to run (This is in the event it fails during the run)"
+echo "git checkout \"${NEXT_BRANCH}\""
+echo "git pull origin \"${NEXT_BRANCH}\""
+echo "git merge --ff-only \"${PR_BRANCH}\""
+echo "git push origin \"${NEXT_BRANCH}\""
+echo "git branch -m \"${TARGET_BRANCH}\" \"${PAST_VERSION_BRANCH}\""
+echo "git push origin :\"${TARGET_BRANCH}\" \"${PAST_VERSION_BRANCH}\""
+echo "git push origin -u \"${PAST_VERSION_BRANCH}\""
+echo "git branch -m \"${NEXT_BRANCH}\" \"${TARGET_BRANCH}\""
+echo "git push origin :\"${NEXT_BRANCH}\" \"${TARGET_BRANCH}\""
+echo "git push origin -u \"${TARGET_BRANCH}\""
+echo "git tag \"${NEW_CIQ_TAG}\" \"${TARGET_BRANCH}\""
+echo "git push origin \"${NEW_CIQ_TAG}\""
 
 echo "git checkout $NEXT_BRANCH"
-git checkout $NEXT_BRANCH
+git checkout "${NEXT_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Failed to checkout ${NEXT_BRANCH}."
   exit 1
 fi
 
 echo "git pull origin $NEXT_BRANCH"
-git pull origin $NEXT_BRANCH
+git pull origin "${NEXT_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Failed to pull ${NEXT_BRANCH}."
   exit 1
 fi
 
-echo "git merge --ff-only $PR_BRANCH"
-git merge --ff-only $PR_BRANCH
+echo "git merge --ff-only ${PR_BRANCH}"
+git merge --ff-only "${PR_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Failed to merge ${PR_BRANCH} into ${NEXT_BRANCH}."
   exit 1
 fi
 
 echo "git push origin $NEXT_BRANCH"
-git push origin $NEXT_BRANCH
+git push origin "${NEXT_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Failed to push ${NEXT_BRANCH}."
   exit 1
@@ -112,59 +112,64 @@ if [ $? -ne 0 ]; then
   echo "Failed to delete ${PR_BRANCH} remotely."
   exit 1
 fi
+git branch -d "${PR_BRANCH}"
+if [ $? -ne 0 ]; then
+  echo "Failed to delete ${PR_BRANCH} locally."
+  exit 1
+fi
 
 
 echo "git branch -m $TARGET_BRANCH $PAST_VERSION_BRANCH"
-git branch -m $TARGET_BRANCH $PAST_VERSION_BRANCH
+git branch -m "${TARGET_BRANCH}" "${PAST_VERSION_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Failed to rename ${TARGET_BRANCH} to ${PAST_VERSION_BRANCH}."
   exit 1
 fi
 
 echo "git push origin :$TARGET_BRANCH $PAST_VERSION_BRANCH"
-git push origin :$TARGET_BRANCH $PAST_VERSION_BRANCH
+git push origin :"${TARGET_BRANCH}" "${PAST_VERSION_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Failed to delete ${TARGET_BRANCH}."
   exit 1
 fi
 
 echo "git push origin -u $PAST_VERSION_BRANCH"
-git push origin -u $PAST_VERSION_BRANCH
+git push origin -u "${PAST_VERSION_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Failed to push ${PAST_VERSION_BRANCH}."
   exit 1
 fi
 
 echo "git branch -m $NEXT_BRANCH $TARGET_BRANCH"
-git branch -m $NEXT_BRANCH $TARGET_BRANCH
+git branch -m "${NEXT_BRANCH}" "${TARGET_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Failed to rename ${NEXT_BRANCH} to ${TARGET_BRANCH}."
   exit 1
 fi
 
 echo "git push origin :$NEXT_BRANCH $TARGET_BRANCH"
-git push origin :$NEXT_BRANCH $TARGET_BRANCH
+git push origin :"${NEXT_BRANCH}" "${TARGET_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Failed to delete ${NEXT_BRANCH}."
   exit 1
 fi
 
 echo "git push origin -u $TARGET_BRANCH"
-git push origin -u $TARGET_BRANCH
+git push origin -u "${TARGET_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Failed to push ${TARGET_BRANCH}."
   exit 1
 fi
 
 echo "git tag $NEW_CIQ_TAG $TARGET_BRANCH"
-git tag $NEW_CIQ_TAG $TARGET_BRANCH
+git tag "${NEW_CIQ_TAG}" "${TARGET_BRANCH}"
 if [ $? -ne 0 ]; then
   echo "Failed to tag ${TARGET_BRANCH} with ${NEW_CIQ_TAG}."
   exit 1
 fi
 
 echo "git push origin $NEW_CIQ_TAG"
-git push origin $NEW_CIQ_TAG
+git push origin "${NEW_CIQ_TAG}"
 if [ $? -ne 0 ]; then
   echo "Failed to push ${NEW_CIQ_TAG}."
   exit 1