fix(commit fixup): handle autostashing dirty changes #868
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
|
This change is part of the following stack: Change managed by git-spice. |
If there are unstaged changes in the worktree when using commit fixup to fix up a downstack branch, we should not pop the autostashed changes until after the upstack restack is complete, and we've switched back to the original branch (not the fixed branch). Ref: #867 (comment)
abhinav
force-pushed
the
commit-fixup-autostash
branch
from
9106a77 to
c757acd
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.
If there are unstaged changes in the worktree when using commit fixup
to fix up a downstack branch, we should not pop the autostashed changes
until after the upstack restack is complete,
and we've switched back to the original branch (not the fixed branch).
Ref: #867 (comment)
[skip changelog]: New entry not required as fixup hasn't been released yet.