Merge pull request kata-containers#8322 from wainersm/git_helper-fix

tests/git-helper: cancel any previous rebase left halfway
Amulyam24 · Oct 27, 2023 · b508091 · b508091
2 parents f5c17f8 + 0ce0abf
commit b508091
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/tests/git-helper.sh b/tests/git-helper.sh
@@ -19,6 +19,8 @@ function add_kata_bot_info() {
 function rebase_atop_of_the_latest_target_branch() {
 	if [ -n "${TARGET_BRANCH}" ]; then
 		echo "Rebasing atop of the latest ${TARGET_BRANCH}"
+		# Recover from any previous rebase left halfway
+		git rebase --abort 2> /dev/null || true
 		git rebase origin/${TARGET_BRANCH}
 	fi
 }