github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-20 16:27:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8322 from wainersm/git_helper-fix

Browse Source 
tests/git-helper: cancel any previous rebase left halfway
This commit is contained in:
Chao Wu
2023-10-27 14:07:16 +08:00
committed by GitHub
parent f5c17f89a3 0ce0abffa6
commit b508091305
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/git-helper.sh
View File

@@ -19,6 +19,8 @@ function add_kata_bot_info() {
function rebase_atop_of_the_latest_target_branch() { function rebase_atop_of_the_latest_target_branch() {
if [ -n "${TARGET_BRANCH}" ]; then if [ -n "${TARGET_BRANCH}" ]; then
echo "Rebasing atop of the latest ${TARGET_BRANCH}" 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} git rebase origin/${TARGET_BRANCH}
fi fi
} }