fix(project): keep bare worktree roots checked out#25860
Open
osamu2001 wants to merge 1 commit intoanomalyco:devfrom
Open
fix(project): keep bare worktree roots checked out#25860osamu2001 wants to merge 1 commit intoanomalyco:devfrom
osamu2001 wants to merge 1 commit intoanomalyco:devfrom
Conversation
intent(project-worktree): desktop open-project should keep a selected bare-backed worktree as the project root instead of collapsing to the bare git common dir constraint(project-cache): project id cache must still live in git-common-dir to avoid sibling bare repo collisions rejected(project-worktree): using the bare repo path as project.worktree because UI and cwd surfaces treat that field as a checked-out workspace root
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.
Issue for this PR
Closes #10643
Type of change
What does this PR do?
Keeps
project.worktreepointed at the checked-out worktree for bare-repo-backed worktrees.The project ID cache still uses
git-common-dir, so the previous bare repo cache collision fix is preserved. This separates the cache location from the workspace root used by desktop/sidebar/cwd surfaces.How did you verify your code works?
bun test --timeout 30000 test/project/project.test.ts --test-name-pattern "bare repo"bun test --timeout 30000 test/project/project.test.tsbun typecheckbun turbo typecheckScreenshots / recordings
N/A - project discovery logic only.
Checklist