chore: update check (#1555)

Co-authored-by: GitHub Action <action@github.com>
tj-actions · Sep 9, 2023 · 81bb5d8 · 81bb5d8
1 parent 523e8b6
commit 81bb5d8
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 7 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
@@ -437,15 +437,28 @@ export const getSHAForPullRequestEvent = async (
           github.context.payload.action &&
           github.context.payload.action === 'synchronize' &&
           previousSha &&
-          (await verifyCommitSha({sha: previousSha, cwd: workingDirectory})) !==
-            0
+          (!previousSha ||
+            (previousSha &&
+              (await verifyCommitSha({
+                sha: previousSha,
+                cwd: workingDirectory,
+                showAsErrorMessage: false
+              })) !== 0))
         ) {
           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'
           )
         }
 
-        if (!previousSha) {
+        if (
+          !previousSha ||
+          (previousSha &&
+            (await verifyCommitSha({
+              sha: previousSha,
+              cwd: workingDirectory,
+              showAsErrorMessage: false
+            })) !== 0)
+        ) {
           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'
           )