fix: prevent similar commit hashes error when using the branch name (#…

…1745) Co-authored-by: GitHub Action <action@github.com>
tj-actions · Nov 27, 2023 · da093c1 · da093c1
1 parent c634be9
commit da093c1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 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
@@ -184,7 +184,7 @@ export const getSHAForNonPullRequestEvent = async (
     currentBranch = currentBranchName
   }
 
-  if (previousSha && currentSha && currentBranch && targetBranch) {
+  if (inputs.baseSha && inputs.sha && currentBranch && targetBranch) {
     if (previousSha === currentSha) {
       core.error(
         `Similar commit hashes detected: previous sha: ${previousSha} is equivalent to the current sha: ${currentSha}.`
@@ -405,7 +405,7 @@ export const getSHAForPullRequestEvent = async (
   })
   let diff = '...'
 
-  if (previousSha && currentSha && currentBranch && targetBranch) {
+  if (inputs.baseSha && inputs.sha && currentBranch && targetBranch) {
     if (previousSha === currentSha) {
       core.error(
         `Similar commit hashes detected: previous sha: ${previousSha} is equivalent to the current sha: ${currentSha}.`