fix: duplicate error output and add --abort flag to sync#34
Merged
Conversation
- Wrap rebase conflict error with errAlreadyPrinted to prevent duplicate output - Add --abort flag to abort interrupted syncs and clean up state - Save sync state (original branch) for all syncs, not just when stashing - Update conflict resolution instructions to mention --abort option
- Add SetConfig expectations for saving original branch state - Add UnsetConfig expectations for cleanup after successful sync - Add comprehensive tests for --abort functionality covering: - Abort with stashed changes - Abort without stashed changes - Abort when no rebase is in progress - Error when no interrupted sync exists
Owner
Author
|
🎉 This PR is included in version 1.3.2 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Problem
Duplicate error output: When a rebase conflict occurs during
stack sync, the git error message appears twice - once in the user-facing instructions and again as the raw error at the end.Missing abort option: There was no easy way to abort an interrupted sync; users had to manually run
git rebase --abortand clean up state.Solution
Fixed duplicate error output
errAlreadyPrintedsentinel error to prevent the Run function from printing it a second timeAdded
--abortflag--abortflag to cleanly abort interrupted syncsImproved error messages
stack sync --abortas an option--resumeand--abortwill restore changesTesting