Update worktree.ts

src/worktree.ts

@@ -3,6 +3,9 @@ import {ActionInterface} from './constants'
 import {execute} from './execute'
 import {extractErrorMessage, suppressSensitiveInformation} from './util'
 
+/**
+ * Git checkout command.
+ */
 export class GitCheckout {
   orphan = false
   commitish?: string | null = null
@@ -22,10 +25,16 @@ export class GitCheckout {
   }
 }
 
+/**
+ * Generates a git worktree.
+ * @param action - The action interface.
+ * @param worktreedir - The worktree directory.
+ * @param branchExists - Bool indicating if the branch exists.
+ */
 export async function generateWorktree(
   action: ActionInterface,
   worktreedir: string,
-  branchExists: unknown
+  branchExists: boolean | number
 ): Promise<void> {
   try {
     info('Creating worktree…')
@@ -44,13 +53,24 @@ export async function generateWorktree(
       action.silent
     )
 
-    // Create a unique branch name
-    const uniqueBranchName = `temp-${Date.now()}`
+    let checkout: GitCheckout
+    let branchName = action.branch
 
-    const checkout = new GitCheckout(
-      uniqueBranchName,
-      `origin/${action.branch}`
-    )
+    /**
+     * If the branch doesn't exist, we need to create a new branch using a unique name.
+     */
+    try {
+      checkout = new GitCheckout(branchName)
+    } catch {
+      console.log('encountered')
+      branchName = `temp-${Date.now()}`
+      checkout = new GitCheckout(branchName, `origin/${action.branch}`)
+    }
+
+    if (branchExists) {
+      // There's existing data on the branch to check out
+      checkout.commitish = `origin/${action.branch}`
+    }
 
     if (
       !branchExists ||
@@ -68,7 +88,7 @@ export async function generateWorktree(
     )
 
     if (!branchExists) {
-      info(`Created the ${uniqueBranchName} branch… 🔧`)
+      info(`Created the ${branchName} branch… 🔧`)
 
       // Our index is in HEAD state, reset
       await execute(
@@ -80,7 +100,7 @@ export async function generateWorktree(
       if (!action.singleCommit) {
         // New history isn't singleCommit, create empty initial commit
         await execute(
-          `git commit --no-verify --allow-empty -m "Initial ${uniqueBranchName} commit"`,
+          `git commit --no-verify --allow-empty -m "Initial ${branchName} commit"`,
           `${action.workspace}/${worktreedir}`,
           action.silent
         )