fix: ignore merge messages with text after newline

* fix(is-ignored): regex not work with newline and extra characters * test(is-ignored): test for newlines with extra characters
conventional-changelog · Oct 5, 2018 · b32bc93 · b32bc93
1 parent ff0111a
commit b32bc93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/@commitlint/is-ignored/src/index.js b/@commitlint/is-ignored/src/index.js
@@ -3,7 +3,7 @@ import semver from 'semver';
 const WILDCARDS = [
 	c =>
 		c.match(
-			/^((Merge pull request)|(Merge (.*?) into (.*?)|(Merge branch (.*?)))(?:\r?\n)*$)/
+			/^((Merge pull request)|(Merge (.*?) into (.*?)|(Merge branch (.*?)))(?:\r?\n)*$)/m
 		),
 	c => c.match(/^(R|r)evert (.*)/),
 	c => c.match(/^(fixup|squash)!/),

diff --git a/@commitlint/is-ignored/src/index.test.js b/@commitlint/is-ignored/src/index.test.js
@@ -61,6 +61,11 @@ test('should return true for merged PRs', t => {
 	t.true(isIgnored('Merge pull request #369'));
 });
 
+test('should return true for branch merges with newline characters and more characters after it', t => {
+	t.true(isIgnored("Merge branch 'ctrom-YarnBuild'\n "));
+	t.true(isIgnored("Merge branch 'ctrom-YarnBuild'\r\n # some comment"));
+});
+
 test('should return true for revert commits', t => {
 	t.true(
 		isIgnored(