From 44a73794b62adf6aa83d49ab194a1548532320cb Mon Sep 17 00:00:00 2001
From: James Ives <iam@jamesiv.es>
Date: Sun, 10 Nov 2019 14:40:54 -0500
Subject: [PATCH] More debugging

---
 lib/git.js | 1 +
 src/git.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/git.js b/lib/git.js
index e563512b..230c6553 100644
--- a/lib/git.js
+++ b/lib/git.js
@@ -84,6 +84,7 @@ function deploy() {
             console.log("Deployment branch does not exist. Creating....");
             yield generateBranch();
         }
+        yield util_1.execute(`git switch -t origin/${constants_1.action.baseBranch}`, constants_1.action.build);
         console.log('list', yield util_1.execute(`ls`, constants_1.action.build));
         yield util_1.execute(`git add .`, constants_1.action.build);
         yield util_1.execute(`git commit -m "Deploying to ${constants_1.action.branch} from ${constants_1.action.baseBranch} ${process.env.GITHUB_SHA}" --quiet`, constants_1.action.build);
diff --git a/src/git.ts b/src/git.ts
index c8694cc4..54f0b233 100644
--- a/src/git.ts
+++ b/src/git.ts
@@ -73,6 +73,8 @@ export async function deploy(): Promise<any> {
     await generateBranch();
   }
 
+  await execute(`git switch -t origin/${action.baseBranch}`, action.build)
+
   console.log('list', await execute(`ls`, action.build))
 
   await execute(`git add .`, action.build);