Fix operation state restoration in linked worktrees#887
Open
xenyal wants to merge 1 commit into
Open
Conversation
xenyal
marked this pull request as ready for review
July 24, 2026 04:11
xenyal
force-pushed
the
fix/linked-worktree-operation-state
branch
from
July 24, 2026 04:14
064e0dd to
91717e3
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
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.
Context
I ran into this through a confusing shell prompt error after completing work in a linked worktree. Overcommit was restoring merge and cherry-pick state into the shared Git directory, which can make another checkout appear to be mid-operation. The shared directory is right for hooks, but these state files belong to the active worktree.
Changes
git rev-parse --git-path, with a fallback for Git versions before 2.5.MERGE_HEAD,MERGE_MODE,MERGE_MSG, andCHERRY_PICK_HEADin the active worktree.