Fix internal state path for multiple worktrees#331
Closed
wantaekchoi wants to merge 3 commits intoAGWA:masterfrom
Closed
Fix internal state path for multiple worktrees#331wantaekchoi wants to merge 3 commits intoAGWA:masterfrom
wantaekchoi wants to merge 3 commits intoAGWA:masterfrom
Conversation
Contributor
|
Please split the test, CI, and actual fix parts into different commits and properly label them. This PR is doing a lot more than what it says on the tin. Also please declare what if any LLM is being used here. |
f91980a to
6392b63
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
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
This changes git-crypt internal state resolution to use
git rev-parse --git-common-dirinstead of--git-dir, so linked worktrees share the same keystate.
The regression test coverage and CI wiring are split into separate commits.
Why
With linked worktrees, storing git-crypt state under the worktree-local git dir can make key state invisible to other worktrees in the same repository.
Using the common git dir keeps that state shared as intended.
Validation
make testpassed in a Rocky Linux 8.10 Docker environmentgit-common-dir/git-crypt/keys/defaultgit-dir/git-crypt/keys/defaultpath is not used