From 6c2a9312264e8a583afc0d9ac548b9a745b7ae77 Mon Sep 17 00:00:00 2001
From: James Ives <iam@jamesiv.es>
Date: Tue, 11 May 2021 19:03:39 -0400
Subject: [PATCH] Removes the call to -D (#713)

* Removes the call to -D

* Update main.test.ts
---
 __tests__/git.test.ts  | 20 ++++++++++----------
 __tests__/main.test.ts |  4 ++--
 src/git.ts             | 19 +++++--------------
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts
index 843d7fd57..1f04fa614 100644
--- a/__tests__/git.test.ts
+++ b/__tests__/git.test.ts
@@ -168,7 +168,7 @@ describe('git', () => {
       const response = await deploy(action)
 
       // Includes the call to generateWorktree
-      expect(execute).toBeCalledTimes(13)
+      expect(execute).toBeCalledTimes(12)
       expect(rmRF).toBeCalledTimes(1)
       expect(response).toBe(Status.SUCCESS)
     })
@@ -191,7 +191,7 @@ describe('git', () => {
       const response = await deploy(action)
 
       // Includes the call to generateWorktree
-      expect(execute).toBeCalledTimes(12)
+      expect(execute).toBeCalledTimes(11)
       expect(rmRF).toBeCalledTimes(1)
       expect(response).toBe(Status.SUCCESS)
     })
@@ -216,7 +216,7 @@ describe('git', () => {
       await deploy(action)
 
       // Includes the call to generateWorktree
-      expect(execute).toBeCalledTimes(10)
+      expect(execute).toBeCalledTimes(11)
       expect(rmRF).toBeCalledTimes(1)
     })
 
@@ -240,7 +240,7 @@ describe('git', () => {
       await deploy(action)
 
       // Includes the call to generateWorktree
-      expect(execute).toBeCalledTimes(9)
+      expect(execute).toBeCalledTimes(10)
       expect(rmRF).toBeCalledTimes(1)
     })
 
@@ -265,7 +265,7 @@ describe('git', () => {
       await deploy(action)
 
       // Includes the call to generateWorktree
-      expect(execute).toBeCalledTimes(9)
+      expect(execute).toBeCalledTimes(10)
       expect(rmRF).toBeCalledTimes(1)
     })
 
@@ -296,7 +296,7 @@ describe('git', () => {
       const response = await deploy(action)
 
       // Includes the call to generateWorktree
-      expect(execute).toBeCalledTimes(13)
+      expect(execute).toBeCalledTimes(12)
       expect(rmRF).toBeCalledTimes(1)
       expect(fs.existsSync).toBeCalledTimes(2)
       expect(response).toBe(Status.SUCCESS)
@@ -328,7 +328,7 @@ describe('git', () => {
         await deploy(action)
 
         // Includes the call to generateWorktree
-        expect(execute).toBeCalledTimes(10)
+        expect(execute).toBeCalledTimes(9)
         expect(rmRF).toBeCalledTimes(1)
       })
     })
@@ -353,7 +353,7 @@ describe('git', () => {
       await deploy(action)
 
       // Includes the call to generateWorktree
-      expect(execute).toBeCalledTimes(10)
+      expect(execute).toBeCalledTimes(9)
       expect(rmRF).toBeCalledTimes(1)
     })
 
@@ -373,7 +373,7 @@ describe('git', () => {
 
       await deploy(action)
 
-      expect(execute).toBeCalledTimes(10)
+      expect(execute).toBeCalledTimes(9)
       expect(rmRF).toBeCalledTimes(1)
       expect(mkdirP).toBeCalledTimes(1)
     })
@@ -393,7 +393,7 @@ describe('git', () => {
       })
 
       const response = await deploy(action)
-      expect(execute).toBeCalledTimes(10)
+      expect(execute).toBeCalledTimes(9)
       expect(rmRF).toBeCalledTimes(1)
       expect(response).toBe(Status.SKIPPED)
     })
diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
index 510e7c65e..82dfee9e6 100644
--- a/__tests__/main.test.ts
+++ b/__tests__/main.test.ts
@@ -49,7 +49,7 @@ describe('main', () => {
       debug: true
     })
     await run(action)
-    expect(execute).toBeCalledTimes(15)
+    expect(execute).toBeCalledTimes(14)
     expect(rmRF).toBeCalledTimes(1)
     expect(exportVariable).toBeCalledTimes(1)
   })
@@ -69,7 +69,7 @@ describe('main', () => {
       isTest: TestFlag.HAS_CHANGED_FILES
     })
     await run(action)
-    expect(execute).toBeCalledTimes(18)
+    expect(execute).toBeCalledTimes(17)
     expect(rmRF).toBeCalledTimes(1)
     expect(exportVariable).toBeCalledTimes(1)
   })
diff --git a/src/git.ts b/src/git.ts
index e2b1d72ba..ed072abae 100644
--- a/src/git.ts
+++ b/src/git.ts
@@ -208,20 +208,11 @@ export async function deploy(action: ActionInterface): Promise<Status> {
     // Cleans up temporary files/folders and restores the git state.
     info('Running post deployment cleanup jobs… 🗑️')
 
-    if (!action.singleCommit) {
-      info(`Resetting branch and removing artifacts…`)
-      await execute(
-        `git checkout -B ${temporaryDeploymentBranch}`,
-        `${action.workspace}/${temporaryDeploymentDirectory}`,
-        action.silent
-      )
-
-      await execute(
-        `git branch -D ${action.branch} --force`,
-        action.workspace,
-        action.silent
-      )
-    }
+    await execute(
+      `git checkout -B ${temporaryDeploymentBranch}`,
+      `${action.workspace}/${temporaryDeploymentDirectory}`,
+      action.silent
+    )
 
     await execute(
       `git worktree remove ${temporaryDeploymentDirectory} --force`,