sds / overcommit / 30714921145

92%

master: 91%

push

github

Fix operation state restoration in linked worktrees (#887)

## 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

- Resolve operation-state files through `git rev-parse --git-path`, with
a fallback for Git versions before 2.5.
- Restore `MERGE_HEAD`, `MERGE_MODE`, `MERGE_MSG`, and
`CHERRY_PICK_HEAD` in the active worktree.
- Preserve merge mode and message contents exactly.

20 of 22 new or added lines in 2 files covered. (90.91%)

3306 of 3596 relevant lines covered (91.94%)

3265.13 hits per line