fix: Allow removing a worktree that has been removed elsewhere (#333)

2026-02-06 12:29:39 +02:00
parent 9e9fbbe0ce
commit 740c899dd7
1 changed files with 6 additions and 0 deletions
@@ -1064,6 +1064,12 @@ export async function removeWorktree(directory, worktreePath, options = {}) {

    return { success: true };
  } catch (error) {
+    // If the worktree doesn't exist or isn't recognized by git, treat as success
+    // since the goal (removing the worktree) is already achieved.
+    const errorMessage = String(error?.message || error || '');
+    if (errorMessage.includes('is not a working tree') || errorMessage.includes('is not a valid path')) {
+      return { success: true };
+    }
    console.error('Failed to remove worktree:', error);
    throw error;
  }