Skip to content

better support for git worktree#186

Open
andreineculau wants to merge 2 commits intoandreineculau-patch-1from
andreineculau-patch-2
Open

better support for git worktree#186
andreineculau wants to merge 2 commits intoandreineculau-patch-1from
andreineculau-patch-2

Conversation

@andreineculau
Copy link
Copy Markdown
Collaborator

running git worktree add some-branch some-branch in a transcrypted repository fails because the "common" config will point to a .git/worktrees/some-branch/transcrypt instead of .git/worktrees/transcrypt

this fix is half-baked because it then makes it impossible to activate transcrypt only inside 1 worktree, but overall it makes sense

@jmurty
Copy link
Copy Markdown
Collaborator

jmurty commented Jan 4, 2025

Thanks for this, I have extended your change so transcrypt (and tests) uses the --git-common-dir option instead of --git-dir in all places.

Does this change make sense? And does it get transcrypt closer to working properly with worktrees (with the caveat you mentioned)?

@andreineculau
Copy link
Copy Markdown
Collaborator Author

Looks good 👍

@djmaze
Copy link
Copy Markdown

djmaze commented Feb 6, 2026

Works for me, nice!

@johnjensenish
Copy link
Copy Markdown

Can I help move this along? With agentic coding tools worktree support is becoming more important to many workflows.

@jmurty
Copy link
Copy Markdown
Collaborator

jmurty commented Apr 6, 2026

Hi, thanks for the interest, I have merged the improvements in this PR so far to main for inclusion in the next release in e14b341 and a6225e3.

I don't use git worktree in my workflows, so I would appreciate feedback about whether these minor changes are sufficient to get transcrypt working with worktrees?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants