Merge pull request #52 from byu-oit/more-merge-commits

Handle more merge commit formats
byu-oit · Aug 10, 2023 · 6ceff58 · 6ceff58
2 parents d9c0dce + 93218a9
commit 6ceff58
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/utils.js b/utils.js
@@ -1,5 +1,5 @@
-const pullRequestMergeCommitRegex = /^Merge pull request #\d+ from \S+/
-const branchMergeCommitRegex = /Merge (remote-tracking )?branch \S+( of https:\/\/github\.com\/\S+)? into \S+/
+const pullRequestMergeCommitRegex = /^Merge pull request #\d+( from \S+)?/
+const branchMergeCommitRegex = /Merge (remote-tracking )?branch \S+( of https:\/\/github\.com\/\S+)?( into \S+)?/
 function isMergeCommitMessage (message) {
   return !!(message.match(pullRequestMergeCommitRegex) || message.match(branchMergeCommitRegex))
 }

diff --git a/utils.test.js b/utils.test.js
@@ -7,7 +7,9 @@ describe('isMergeCommitMessage', () => {
       'Merge branch dev into prd',
       'Merge branch \'idHash\' of https://github.com/byu-oit/ces-adm-sv-recommendations into idHash',
       'Merge remote-tracking branch \'origin/dev\' into jacobs27',
-      'Merge pull request #1078 from byu-oit/dev'
+      'Merge pull request #1078 from byu-oit/dev',
+      'Merge pull request #327',
+      'Merge branch \'dev\''
     ]
     for (const message of mergeCommits) {
       test(message, () => {