amend: Preserve amended commit message on stack replay conflict#272
Open
Abhishek21g wants to merge 1 commit into
Open
amend: Preserve amended commit message on stack replay conflict#272Abhishek21g wants to merge 1 commit into
Abhishek21g wants to merge 1 commit into
Conversation
When revup amend fails while replaying the stack, save a changed commit message to the scratch dir so users can recover it after resolving conflicts. Fixes Skydio#266
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
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.
Summary
Fixes #266.
When
revup amendrewrites a commit message and then fails while replaying the rest of the stack (e.g. merge conflict), the user's new message is now saved under.revup/AMENDED_COMMIT_MSGin the scratch directory and the path is logged. The message is only saved when it actually changed from the original commit.Repro
revup amend HEAD~1with--editand a new messageFix
preserve_amended_commit_msg()called from amend conflict pathsamended_msg != original_msgVerification