fix: raise error when the previous sha cannot be determined and since…

…_last_remote_commit is true (#1554) Co-authored-by: GitHub Action <[email protected]>
tj-actions · Sep 9, 2023 · 523e8b6 · 523e8b6
1 parent 4a0a3c4
commit 523e8b6
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 30 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
@@ -419,30 +419,36 @@ export const getSHAForPullRequestEvent = async (
       if (
         !previousSha ||
         (previousSha &&
-          (await verifyCommitSha({sha: previousSha, cwd: workingDirectory})) !==
-            0)
+          (await verifyCommitSha({
+            sha: previousSha,
+            cwd: workingDirectory,
+            showAsErrorMessage: false
+          })) !== 0)
       ) {
+        core.info(
+          `Unable to locate the previous commit in the local history for ${github.context.eventName} (${github.context.payload.action}) event. Falling back to the previous commit in the local history.`
+        )
+
+        previousSha = await getParentSha({
+          cwd: workingDirectory
+        })
+
         if (
           github.context.payload.action &&
-          github.context.payload.action === 'synchronize'
+          github.context.payload.action === 'synchronize' &&
+          previousSha &&
+          (await verifyCommitSha({sha: previousSha, cwd: workingDirectory})) !==
+            0
         ) {
-          throw Error(
-            'Unable to locate the previous commit in the local history. Please ensure to checkout pull request HEAD commit instead of the merge commit. See: https://github.com/actions/checkout/blob/main/README.md#checkout-pull-request-head-commit-instead-of-merge-commit)'
-          )
-        } else {
-          core.info(
-            `Unable to locate the remote branch head sha for ${github.context.eventName} (${github.context.payload.action}) events. Falling back to the previous commit in the local history.`
+          throw new Error(
+            'Unable to locate the previous commit in the local history. Please ensure to checkout pull request HEAD commit instead of the merge commit. See: https://github.com/actions/checkout/blob/main/README.md#checkout-pull-request-head-commit-instead-of-merge-commit'
           )
         }
-        previousSha = await getParentSha({
-          cwd: workingDirectory
-        })
 
         if (!previousSha) {
-          core.warning(
-            'Unable to locate the previous commit in the local history. Falling back to the pull request base sha.'
+          throw new Error(
+            'Unable to locate the previous commit in the local history. Please ensure to checkout pull request HEAD commit instead of the merge commit. See: https://github.com/actions/checkout/blob/main/README.md#checkout-pull-request-head-commit-instead-of-merge-commit'
           )
-          previousSha = github.context.payload.pull_request?.base?.sha
         }
       }
     } else {