Update worktree.ts

JamesIves · May 18, 2024 · bbaccba · bbaccba
1 parent 4dd89e1
commit bbaccba
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/worktree.ts b/src/worktree.ts
@@ -40,12 +40,22 @@ export async function generateWorktree(
       )
     }
 
-    await execute(
-      `git worktree remove ${worktreedir}`,
+    // Check if the worktree already exists
+    const {stdout: worktreeList} = await execute(
+      `git worktree list`,
       action.workspace,
       action.silent
     )
 
+    // If the worktree exists, remove it
+    if (worktreeList.includes(worktreedir)) {
+      await execute(
+        `git worktree remove ${worktreedir}`,
+        action.workspace,
+        action.silent
+      )
+    }
+
     await execute(
       `git worktree add --no-checkout --detach ${worktreedir}`,
       action.workspace,