Repository navigation
Explain recovery when stashed repository state cannot be restored - #935
Merged
Merged
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
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.
When setup or cleanup cannot restore stashed changes, the error now identifies the exact saved stash commit and gives a
git stash branchrecovery command. This addresses the locked-file cleanup failure reported in #762 without attempting another restore against the same locked file.The original configuration-signature failure now leaves staged and unstaged changes intact; an integration regression test verifies that behavior. Real-Git tests inject failures while restoring the index, resetting the working tree, and applying the stash, then execute the advertised recovery command and verify the staged/unstaged contents and previous stash for both pre-commit and commit-msg contexts.
Validation: all 2,100 examples pass locally with 100% line coverage; focused stash/integration specs and RuboCop pass.
Closes #762.