From 44782622cd76929ff0ad6a68020bf7749ca25b82 Mon Sep 17 00:00:00 2001 From: Mario Nebl Date: Tue, 26 Dec 2017 19:15:36 +0100 Subject: [PATCH 1/2] fix: ignore branch merges with newlines --- @commitlint/core/src/lint.js | 1 + @commitlint/is-ignored/src/index.js | 2 +- @commitlint/is-ignored/src/index.test.js | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/@commitlint/core/src/lint.js b/@commitlint/core/src/lint.js index f0d375fe5c..7a9d6ca374 100644 --- a/@commitlint/core/src/lint.js +++ b/@commitlint/core/src/lint.js @@ -5,6 +5,7 @@ import entries from 'lodash.topairs'; export default async (message, rules = {}, opts = {}) => { // Found a wildcard match, skip + console.log({isIgnored: isIgnored(message)}); if (isIgnored(message)) { return { valid: true, diff --git a/@commitlint/is-ignored/src/index.js b/@commitlint/is-ignored/src/index.js index 9ef99f7220..1dda24cb4b 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 (.*?))$)/ + /^(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 5ee03b355f..f5646f11fe 100644 --- 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')); }); From 3b87b44dd1e012330b0d9335b624dae4a0fa1730 Mon Sep 17 00:00:00 2001 From: Mario Nebl Date: Tue, 26 Dec 2017 19:32:00 +0100 Subject: [PATCH 2/2] fix: remove stray console.log --- @commitlint/core/src/lint.js | 1 - 1 file changed, 1 deletion(-) diff --git a/@commitlint/core/src/lint.js b/@commitlint/core/src/lint.js index 7a9d6ca374..f0d375fe5c 100644 --- a/@commitlint/core/src/lint.js +++ b/@commitlint/core/src/lint.js @@ -5,7 +5,6 @@ import entries from 'lodash.topairs'; export default async (message, rules = {}, opts = {}) => { // Found a wildcard match, skip - console.log({isIgnored: isIgnored(message)}); if (isIgnored(message)) { return { valid: true,