tests/git-helper: cancel any previous rebase left halfway #8322
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In bare-metal machines the git tree might get on unstable state with the previous rebase left halfway. So let's attempt to abort any rebase before. Fixes kata-containers#8318 Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
|
I need this fix to unblock #7231 because the job running on TDX has failed to rebase the code: https://github.com/kata-containers/kata-containers/actions/runs/6654854651/job/18085475677?pr=7231 |
sprt
approved these changes
Oct 26, 2023
fidencio
approved these changes
Oct 26, 2023
|
/test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In bare-metal machines the git tree might get on unstable state with the previous rebase left halfway. So let's attempt to abort any rebase before.
Fixes #8318
Signed-off-by: Wainer dos Santos Moschetta wainersm@redhat.com