feat: add support for bitbucket merge messages

CHANGELOG.md

@@ -1,3 +1,13 @@
+## **2.2.0** <sub><sup>2022-11-06 ([9e026c5...d0b5b6b](https://github.com/qoomon/git-conventional-commits/compare/9e026c5...d0b5b6b?diff=split))</sup></sub>
+
+### Features
+*  add support for bitbucket merge messages ([d0b5b6b](https://github.com/qoomon/git-conventional-commits/commit/d0b5b6b))
+
+
+### Bug Fixes
+*  fix \#107 ([b7a3e41](https://github.com/qoomon/git-conventional-commits/commit/b7a3e41))
+
+
 ## **2.1.2** <sub><sup>2022-09-20 ([9e026c5...68a02b6](https://github.com/qoomon/git-conventional-commits/compare/9e026c5...68a02b6?diff=split))</sup></sub>
 
 ### Bug Fixes

lib/commands/config.js

@@ -86,7 +86,10 @@ function defaultConfig() {
 
     // regex patterns
     config.convention.msgRegex = /^(?<type>\w+)(?:\((?<scope>[^()]+)\))?(?<breaking>!)?:\s*(?<description>.+)/i;
-    config.convention.msgMergeRegex = /^Merge branch +["'](?<branch>.+)['"]/i;
+    config.convention.msgMergeRegexList = [
+        /^Merge (?<description>.+)/i, // Default Git merge message
+        /^Merged in (?<description>.+)/i, // Bitbucket merge message e.g. "Merged in team/repository/branch"
+    ];
     config.convention.msgRevertRegex = /^Revert +["'](?<subject>.+)['"]/i;
     config.convention.bodyRevertRegex = /(?<hash>\S+)\.+?$/im; // \S - no white spaces
     // match only release version e.g. 1.2.3 ((?:[^-]|$) ignores pre-release versions e.g. 1.2.3-SNAPSHOT)

lib/gitCommitConvention.js

@@ -94,10 +94,10 @@ module.exports = function (convention, commitAnchor = 'HEAD') {
             conventionalSubject.breaking = msgMatch.groups.breaking === '!';
             conventionalSubject.description = msgMatch.groups.description;
         } else {
-            const msgMergeMatch = commit.subject.match(convention.msgMergeRegex);
+            const msgMergeMatch = getFirstMatch(commit.subject, convention.msgMergeRegexList);
             if (msgMergeMatch) {
                 conventionalSubject.type = 'merge';
-                conventionalSubject.description = msgMergeMatch.groups.branch;
+                conventionalSubject.description = msgMergeMatch.groups.description;
             } else {
                 const msgRevertMatch = commit.subject.match(convention.msgRevertRegex);
                 if (msgRevertMatch) {
@@ -132,4 +132,13 @@ module.exports = function (convention, commitAnchor = 'HEAD') {
             excludePattern: '*-*', // exclude pre-release versions
         })
     }
+
+    function getFirstMatch(string, regexList) {
+        for (const regex of regexList) {
+            const match = string.match(regex);
+            if (match) {
+                return match;
+            }
+        }
+    }
 };