fix: reliably verify rollback stash creation - #1786
Open
wgnrai wants to merge 1 commit into
Open
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
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.
Summary
Fixes the rollback-stash verification bug reported in #1753.
When the repository already has a stash,
git stash list --format=%gd -n 1returnsstash@{0}both before and after a successfulgit stash push. The updater therefore falsely raisesFailed to create the pre-update rollback stash.and never reaches the requested checkout.Root cause
The positional stash ref is stable while the stash commit changes.
Fix
stash@{0}as the lifecycle ref used bystash apply/stash drop.%Hfor before/after creation verification.Tests
Added regression coverage for detecting a new stash when an existing stash is present and retaining a positional ref that works with
stash applyandstash drop. Both tests pass when run directly in temporary Git repositories.This PR addresses the stash-verification bug only. The separate health-check timeout issue in #1753 remains outside this PR.
Related to #1753