From e5bdc5c7548f97941e19e45832d9ba0106aa2934 Mon Sep 17 00:00:00 2001 From: Jimmy King Date: Sat, 9 Feb 2019 05:05:05 -0700 Subject: [PATCH] fix(is-ignored): ignore bitbuckets automatic merge (#573) --- @commitlint/is-ignored/src/index.js | 2 +- @commitlint/is-ignored/src/index.test.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/@commitlint/is-ignored/src/index.js b/@commitlint/is-ignored/src/index.js index e354701263..fe8d4d2fe5 100644 --- 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 index a5515da930..3a24892bdd 100644 --- 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 => {