check the commit message with regex to see if it is a "merge commit" …

…/ simple branch update
github · Sep 1, 2023 · 064306d · 064306d
1 parent ae125b2
commit 064306d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/__tests__/functions/identical-commit-check.test.js b/__tests__/functions/identical-commit-check.test.js
@@ -36,14 +36,20 @@ beforeEach(() => {
         getBranch: jest.fn().mockReturnValue({
           data: {
             commit: {
-              sha: 'deadbeef'
+              sha: 'deadbeef',
+              commit: {
+                message: 'cool new feature'
+              }
             }
           }
         }),
         listCommits: jest.fn().mockReturnValue({
           data: [
             {
               sha: 'deadbeef',
+              commit: {
+                message: 'cool new feature'
+              },
               parents: [
                 {
                   sha: 'beefdead'

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/functions/identical-commit-check.js b/src/functions/identical-commit-check.js
@@ -36,8 +36,12 @@ export async function identicalCommitCheck(octokit, context, environment) {
     }
   )
   var latestCommitSha
+  const mergeCommitRegex = /^Merge branch .+ into .+$/
   for (const commit of defaultBranchCommitsData) {
-    if (commit.parents.length === 1) {
+    if (
+      commit.parents.length === 1 &&
+      !mergeCommitRegex.test(commit.commit.message)
+    ) {
       latestCommitSha = commit.sha
       break
     }