fix(plugin): preserve branch slashes in worktree path to match CLI#47
Merged
guodong-sq merged 1 commit intomainfrom Mar 22, 2026
Merged
fix(plugin): preserve branch slashes in worktree path to match CLI#47guodong-sq merged 1 commit intomainfrom
guodong-sq merged 1 commit intomainfrom
Conversation
The plugin's GitBranchHelper.worktreePathForBranch replaced '/' with '-' in branch names, creating flat directory names (e.g., test-foo). The CLI uses the branch name verbatim, creating nested directories (e.g., test/foo). This caused worktrees created by CLI and plugin for the same branch to land at different paths. Match the CLI behavior: use the branch name directly as a path, letting '/' create subdirectories. Path traversal is still blocked by sanitizeBranchName rejecting '..' in branch names. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
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.
Summary
The plugin's
GitBranchHelper.worktreePathForBranchreplaced/with-in branch names, creating flat directory names (e.g.,test-foo). The CLI uses the branch name verbatim as a path, creating nested directories (e.g.,test/foo). This caused worktrees created by CLI and plugin for the same branch to land at different locations.Fix: remove the
replace("/", "-")call.Path.resolve("test/foo")naturally creates the nested path, matching CLI behavior. Path traversal is still blocked bysanitizeBranchNamerejecting...Test plan
cd wt-jetbrains-plugin && ./gradlew testfeature/foo→ worktree atworktreesBase/feature/foo(notfeature-foo)simple→ worktree atworktreesBase/simple(unchanged)sanitizeBranchNamestill rejects..🤖 Generated with Claude Code