ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-02-01 08:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: enhance path resolution for cross-platform compatibility in worktree handling

Browse Source 
- Updated the worktree creation and retrieval logic to resolve paths to absolute for improved cross-platform compatibility.
- Ensured that provided worktree paths are validated and resolved correctly, preventing issues on different operating systems.
- Refactored existing functions to consistently return absolute paths, enhancing reliability across Windows, macOS, and Linux environments.
This commit is contained in:
Kacper
2025-12-16 22:16:21 +01:00
parent 04d263b1ed
commit da90bafde8
2 changed files with 66 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/server/src/routes/worktree/routes/create.ts
View File

@@ -41,7 +41,12 @@ async function findExistingWorktreeForBranch(
} else if (line === "" && currentPath && currentBranch) {
// End of a worktree entry
if (currentBranch === branchName) {
return { path: currentPath, branch: currentBranch };
// Resolve to absolute path - git may return relative paths
// Critical for cross-platform compatibility (Windows, macOS, Linux)
const resolvedPath = path.isAbsolute(currentPath)
? path.resolve(currentPath)
: path.resolve(projectPath, currentPath);
return { path: resolvedPath, branch: currentBranch };
}
currentPath = null;
currentBranch = null;
@@ -50,7 +55,11 @@ async function findExistingWorktreeForBranch(
// Check the last entry (if file doesn't end with newline)
if (currentPath && currentBranch && currentBranch === branchName) {
return { path: currentPath, branch: currentBranch };
// Resolve to absolute path for cross-platform compatibility
const resolvedPath = path.isAbsolute(currentPath)
? path.resolve(currentPath)
: path.resolve(projectPath, currentPath);
return { path: resolvedPath, branch: currentBranch };
}
return null;
@@ -144,10 +153,13 @@ export function createCreateHandler() {
// Track the branch so it persists in the UI even after worktree is removed
await trackBranch(projectPath, branchName);
// Resolve to absolute path for cross-platform compatibility
// normalizePath converts to forward slashes for API consistency
const absoluteWorktreePath = path.resolve(worktreePath);
res.json({
success: true,
worktree: {
path: normalizePath(worktreePath),
path: normalizePath(absoluteWorktreePath),
branch: branchName,
isNew: !branchExists,
},