From 83442d5c91a5e37a51155c7e6689a5ed1aef0b7d Mon Sep 17 00:00:00 2001
From: Christopher Trom <ctrom@peoplenetonline.com>
Date: Thu, 11 Jan 2018 10:13:59 -0600
Subject: [PATCH] fix: ignore branch merges with multiple newlines

---
 @commitlint/is-ignored/src/index.js      | 2 +-
 @commitlint/is-ignored/src/index.test.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/@commitlint/is-ignored/src/index.js b/@commitlint/is-ignored/src/index.js
index 1dda24cb4b..813cb8b34d 100644
--- 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)*$)/
 		),
 	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
index f5646f11fe..8adb2260dd 100644
--- a/@commitlint/is-ignored/src/index.test.js
+++ b/@commitlint/is-ignored/src/index.test.js
@@ -52,6 +52,11 @@ test('should return true for branch merges with newline characters', t => {
 	t.true(isIgnored("Merge branch 'ctrom-YarnBuild'\r\n"));
 });
 
+test('should return true for branch merges with multiple newline characters', t => {
+	t.true(isIgnored("Merge branch 'ctrom-YarnBuild'\n\n\n"));
+	t.true(isIgnored("Merge branch 'ctrom-YarnBuild'\r\n\r\n\r\n"));
+});
+
 test('should return true for merged PRs', t => {
 	t.true(isIgnored('Merge pull request #369'));
 });