rebase-tool: Allow 'continue' and 'finish' to work in exec step #291
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
If using the --exec argument, the rebase may stop during an exec step if, for example, the tests failed. When stopped during an exec step, there's no .git/rebase-merge/stopped-sha file, so the tool cannot pick the rebase back up nor finish early. Instead, get the SHA from .git/rebase-merge/done, if the last entry in the file is an 'edit' step. If the last entry is instead an 'exec' step, handle that separately.
12wrigja
approved these changes
Jan 13, 2025
There was a problem hiding this comment.
Thanks - I never realized that the done list also contained the active step. Now you mention it, I'm not really sure what it was I did to continue rebasing if the automated exec failed. Maybe just manually continued the rebase, and then once that inevitably failed on a non-exec step retain trt continue? Regardless, this seems cleaner.
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
I went to do some rebasing and found the rebase tool didn't really work with
--exec— whenever the tests would fail in the exec step, it was impossible to runtrt continueortrt finish; the tool would just think it was all done, and exit immediately. Here's a fix.Note that to move on after an exec failure, you now have to have run
trt execto mark the last commit as having succeeded. Ideally you wouldn't have to do this and would just be able to runtrt continue, but I didn't immediately see a way to implement that without a large refactor.