Fix git-crypt in linked worktrees (per-worktree fallback)#333
Open
thebino wants to merge 2 commits 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
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.
Running
git worktree addinside a git-crypt repository fails in the smudge filter:git-crypt resolves its internal state directory (
.git/git-crypt, which holds the symmetric keys) fromgit rev-parse --git-dir. In a linked worktree that returns.git/worktrees/<name>, which never contains the keys — they only ever live in the shared common dir. So checkout of an encrypted file in the new worktree aborts.This PR resolves the state directory per-worktree when it is already provisioned, and otherwise fall back to
git rev-parse --git-common-dir:git worktree addchecks out decrypted.Because the per-worktree location still wins when present, this composes with
setups that keep the git-crypt filter config per-worktree
(
extensions.worktreeConfig), giving independent per-worktree lock statewithout duplicating the key.
Fixes #105