daonanchao/vibe-kanban
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix worktree path handling on windows (#1859)

Browse Source
This commit is contained in:
Solomon
2026-01-09 09:31:08 +00:00
committed by GitHub
parent af70dd9239
commit 47facf12ec
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/services/src/services/worktree_manager.rs
View File

@@ -187,6 +187,11 @@ impl WorktreeManager {
git_repo_path: &Path,
worktree_path: &Path,
) -> Result<Option<String>, WorktreeError> {
fn canonicalize_for_compare(path: &Path) -> PathBuf {
dunce::canonicalize(path).unwrap_or_else(|_| path.to_path_buf())
}
let worktree_root = canonicalize_for_compare(&normalize_macos_private_alias(worktree_path));
let worktree_metadata_path = git_repo_path.join(".git").join("worktrees");
let worktree_metadata_folders = fs::read_dir(&worktree_metadata_path)
.map_err(|e| {
@@ -205,7 +210,8 @@ impl WorktreeManager {
&& let Ok(gitdir_content) = fs::read_to_string(&gitdir_path)
&& normalize_macos_private_alias(Path::new(gitdir_content.trim()))
.parent()
.map(|p| p == worktree_path)
.map(canonicalize_for_compare)
.map(|p| p == worktree_root)
.unwrap_or(false)
{
return Ok(Some(entry.file_name().to_string_lossy().to_string()));