LT Rebase Merge: Deal with failure better, Shell Check fixes #23
Conversation
This file contains hidden or 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 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
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
bmastbergen
previously approved these changes
Jun 25, 2025
PlaidCat
force-pushed
the
{jmaple}_lt_rebuild_merge_fixes
branch
from
b1055ff to
7940a50
Compare
There was a problem hiding this comment.
Pull Request Overview
Enhances the lt_rebase_merge.sh script by printing all expected git commands before execution and reinforcing variable quoting for safe shell expansion.
- Prints anticipated git steps upfront for easier manual recovery on failure
- Wraps all branch and tag variables in quotes to avoid word-splitting
- Applies ShellCheck-inspired fixes and consistency updates
Comments suppressed due to low confidence (1)
lt_rebase_merge.sh:66
- [nitpick] Consider rephrasing this header for clarity, e.g.
echo "Commands to run if the script fails mid-execution:".
echo "Commands expected to run (This is in the event it fails during the run)"
Includes PR Copilot suggestions, mostly just some minor grammar and print safety checks not identified by shellcheck.
PlaidCat
force-pushed
the
{jmaple}_lt_rebuild_merge_fixes
branch
from
7940a50 to
95b8740
Compare
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.
Due to changes I made to the rules I accidentally blocked our process here and the
lt_rebase_merge.shscript failed mid way so I had to hand redo it. It was possible to do this from the shell output but it was less straight forward than I'd have wished and for other users.Now we're adding the intended actions prior to starting the script so users can copy and paste.
Ideally in the future this will be self healing state machine.