fix: error detecting initial commits (#1181)

Co-authored-by: GitHub Action <action@github.com>
tj-actions · May 26, 2023 · 9ad1a5b · 9ad1a5b
1 parent 88fb02b
commit 9ad1a5b
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 29 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/commitSha.ts b/src/commitSha.ts
@@ -63,6 +63,7 @@ export interface DiffResult {
   currentBranch: string
   targetBranch: string
   diff: string
+  initialCommit?: boolean
 }
 
 export const getSHAForPushEvent = async (
@@ -201,20 +202,15 @@ export const getSHAForPushEvent = async (
         })
       }
 
-      if (previousSha === currentSha) {
-        if (!(await getParentSha({cwd: workingDirectory}))) {
+      if (!previousSha || previousSha === currentSha) {
+        previousSha = await getParentSha({
+          cwd: workingDirectory
+        })
+
+        if (!previousSha) {
           core.warning('Initial commit detected no previous commit found.')
           initialCommit = true
           previousSha = currentSha
-        } else {
-          previousSha = await getParentSha({
-            cwd: workingDirectory
-          })
-        }
-      } else {
-        if (!previousSha) {
-          core.error('Unable to locate a previous commit.')
-          throw new Error('Unable to locate a previous commit.')
         }
       }
     }
@@ -241,7 +237,8 @@ export const getSHAForPushEvent = async (
     currentSha,
     currentBranch,
     targetBranch,
-    diff
+    diff,
+    initialCommit
   }
 }
 

diff --git a/src/main.ts b/src/main.ts
@@ -89,6 +89,12 @@ export async function run(): Promise<void> {
     )
   }
 
+  if (diffResult.initialCommit) {
+    core.info('This is the first commit for this repository; exiting...')
+    core.endGroup()
+    return
+  }
+
   core.info(
     `Retrieving changes between ${diffResult.previousSha} (${diffResult.targetBranch}) → ${diffResult.currentSha} (${diffResult.currentBranch})`
   )

diff --git a/src/utils.ts b/src/utils.ts
@@ -526,15 +526,20 @@ export const gitLsRemote = async ({
 }
 
 export const getParentSha = async ({cwd}: {cwd: string}): Promise<string> => {
-  const {stdout} = await exec.getExecOutput(
+  const {stdout, exitCode} = await exec.getExecOutput(
     'git',
     ['rev-list', '-n', '1', 'HEAD^'],
     {
       cwd,
+      ignoreReturnCode: true,
       silent: process.env.RUNNER_DEBUG !== '1'
     }
   )
 
+  if (exitCode !== 0) {
+    return ''
+  }
+
   return stdout.trim()
 }