fix(jj): prevent panic when removing a workspace#7
Merged
Conversation
Removing a freshly created workspace panicked inside jj-lib. A new workspace's working-copy commit is an empty head, so forgetting it abandons that commit and leaves its descendants needing a rebase. The transaction was committed without that rebase, tripping an internal assertion. Call rebase_descendants() after remove_wc_commit() in both the forget and rename paths before committing the transaction. Rename had the same latent gap and is fixed alongside. Adds an e2e regression test that creates and then removes a workspace.
f97c125 to
d480001
Compare
8215f03 to
62afd13
Compare
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.
Removing a freshly created workspace panicked inside jj-lib. A new
workspace's working-copy commit is an empty head, so forgetting it
abandons that commit and leaves its descendants needing a rebase. The
transaction was committed without that rebase, tripping an internal
assertion.
Call rebase_descendants() after remove_wc_commit() in both the forget
and rename paths before committing the transaction. Rename had the same
latent gap and is fixed alongside. Adds an e2e regression test that
creates and then removes a workspace.