fix(is-ignored): ignore bitbuckets automatic merge (#573)

conventional-changelog · Feb 9, 2019 · e5bdc5c · e5bdc5c
1 parent bc06c05
commit e5bdc5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/@commitlint/is-ignored/src/index.js b/@commitlint/is-ignored/src/index.js
@@ -17,7 +17,7 @@ const WILDCARDS = [
 		),
 	c => c.match(/^Merged (.*?)(in|into) (.*)/),
 	c => c.match(/^Merge remote-tracking branch (.*)/),
-	c => c.match(/^Automatic merge from (.*)/),
+	c => c.match(/^Automatic merge(.*)/),
 	c => c.match(/^Auto-merged (.*?) into (.*)/)
 ];
 

diff --git a/@commitlint/is-ignored/src/index.test.js b/@commitlint/is-ignored/src/index.test.js
@@ -107,6 +107,7 @@ test('should return true for bitbucket merge commits', t => {
 		isIgnored('Merged in feature/facebook-friends-sync (pull request #8)')
 	);
 	t.true(isIgnored('Merged develop into feature/component-form-select-card'));
+	t.true(isIgnored('Automatic merge'));
 });
 
 test('should return true for automatic merge commits', t => {