fix(record): support --stash on a detached HEAD
#1611
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
This addresses an overlooked review comment from arxanas#1150: > issue: Won't this not work if no branch is checked out before trying to > stash? In that case, it seems like git record --stash would make the commit > without switching back to the parent commit. And, indeed, that's exactly the case! Ref: arxanas#1150 (comment)
claytonrcarter
commented
Sep 26, 2025
claytonrcarter
force-pushed
the
record-stash-detached
branch
from
5cd3419 to
843a6cb
Compare
claytonrcarter
force-pushed
the
record-stash-detached
branch
from
843a6cb to
51cc3ed
Compare
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.
I've been using
record --stashmore often, and I've noticed that it doesn't work while on a detached HEAD: it creates the commit correctly, but doesn't switch back to the previous commit. It looks like this was identified in the original review but a fix didn't make it into that PR. I've added a test for this case, too.After fixing that, I followed up with a refactor to reduce duplication between the logic that handles
--detach(ie "move the branch back to the parent commit") and--stash(ie "and checkout the parent commit").