feat: support merges of remote branches

dev-build-deploy · Jun 17, 2024 · 049cd96 · 049cd96
1 parent 24a27c5
commit 049cd96
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/commit.ts b/src/commit.ts
@@ -204,7 +204,7 @@ export function getFooterElementsFromParagraph(
 function subjectIsMergePattern(subject: string): boolean {
   const githubMergeRegex = /^Merge pull request #(\d+) from '?(.*)'?$/;
   const bitbucketMergeRegex = /^Merged in '?(.*)'? \(pull request #(\d+)\)$/;
-  const gitlabMergeRegex = /^Merge branch '?(.*?)'? into '?(.*?)'?$/;
+  const gitlabMergeRegex = /^Merge( remote-tracking)? branch '?(.*?)'? into '?(.*?)'?$/;
 
   return githubMergeRegex.test(subject) || bitbucketMergeRegex.test(subject) || gitlabMergeRegex.test(subject);
 }

diff --git a/test/conventionalCommit.test.ts b/test/conventionalCommit.test.ts
@@ -310,6 +310,9 @@ describe("Merge commits", () => {
     { message: "Merge branch 'ci/some-branch' into 'main'" },
     { message: "Merge branch 'ci/some-branch' into main" },
     { message: "Merge branch ci/some-branch into main" },
+    { message: "Merge remote-tracking branch 'ci/some-branch' into 'main'" },
+    { message: "Merge remote-tracking branch 'ci/some-branch' into main" },
+    { message: "Merge remote-tracking branch ci/some-branch into main" },
   ];
 
   it.each(tests)("$message", test => {