x

index.ts

@@ -29,6 +29,18 @@ async function run(): Promise<void> {
     }
 
     const workingDir = core.getInput('working-dir') || '.'
+
+    const exists = await ioUtil.exists(`${workingDir}/public/.git/config`)
+    if (exists) {
+      await exec.exec(`git status`, [], {
+        cwd: `${workingDir}/public`,
+      })
+      await exec.exec(`git branch`, ['--all'], {
+        cwd: `${workingDir}/public`,
+      })
+      await exec.exec(`git switch`, ['-c', `${deployBranch}`], {cwd: `${workingDir}/public`})
+    }
+
     const pkgManager = (await ioUtil.exists(`${workingDir}/yarn.lock`)) ? 'yarn' : 'npm'
     console.log(`Installing your site's dependencies using ${pkgManager}.`)
     await exec.exec(`${pkgManager} install`, [], {cwd: workingDir})
@@ -63,17 +75,8 @@ async function run(): Promise<void> {
     console.log(`Deploying to repo: ${repo} and branch: ${deployBranch}`)
     console.log('You can configure the deploy branch by setting the `deploy-branch` input for this action.')
 
-    const exists = await ioUtil.exists(`${workingDir}/public/.git/config`)
     if (!exists) {
       await exec.exec(`git init`, [], {cwd: `${workingDir}/public`})
-    } else {
-      await exec.exec(`git state`, [], {
-        cwd: `${workingDir}/public`,
-      })
-      await exec.exec(`git branch`, ['--all'], {
-        cwd: `${workingDir}/public`,
-      })
-      await exec.exec(`git switch`, ['-c', `${deployBranch}`], {cwd: `${workingDir}/public`})
     }
 
     const gitUserName = core.getInput('git-config-name') || github.context.actor