fix: ignore branch merges with newlines (#214)

* fix: ignore branch merges with newlines * fix: remove stray console.log
conventional-changelog · Jan 9, 2018 · c94c4dc · c94c4dc
1 parent 87eb33b
commit c94c4dc
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 (.*?))$)/
+			/^(Merge pull request)|(Merge (.*?) into (.*?)|(Merge branch (.*?))(?:\r?\n)?$)/
 		),
 	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
@@ -47,6 +47,11 @@ test('should return true for branch merges', t => {
 	t.true(isIgnored("Merge branch 'iss53'"));
 });
 
+test('should return true for branch merges with newline characters', t => {
+	t.true(isIgnored("Merge branch 'ctrom-YarnBuild'\n"));
+	t.true(isIgnored("Merge branch 'ctrom-YarnBuild'\r\n"));
+});
+
 test('should return true for merged PRs', t => {
 	t.true(isIgnored('Merge pull request #369'));
 });