diff --git a/tools/validate-commit-message/validate-commit-message.js b/tools/validate-commit-message/validate-commit-message.js index a413cbc87a..85f544ae61 100644 --- a/tools/validate-commit-message/validate-commit-message.js +++ b/tools/validate-commit-message/validate-commit-message.js @@ -22,7 +22,7 @@ const configPath = path.resolve(__dirname, './commit-message.json'); const config = JSON.parse(fs.readFileSync(configPath, 'utf8')); const PATTERN = /^(\w+)(?:\(([^)]+)\))?\: (.+)$/; const FIXUP_SQUASH = /^(fixup|squash)\! /i; -const REVERT = /^revert: (\"(.*)\"|(.*))?$/i; +const REVERT = /^revert:? (\"(.*)\"|(.*))?$/i; module.exports = function(commitSubject) { commitSubject = commitSubject.replace(FIXUP_SQUASH, ''); diff --git a/tools/validate-commit-message/validate-commit-message.spec.js b/tools/validate-commit-message/validate-commit-message.spec.js index 138b2f5d19..04dea9579f 100644 --- a/tools/validate-commit-message/validate-commit-message.spec.js +++ b/tools/validate-commit-message/validate-commit-message.spec.js @@ -45,10 +45,10 @@ describe('validate-commit-message.js', function() { expect(validateMessage('fixup! release(packaging): something')).toBe(VALID); expect(validateMessage('squash! release(packaging): something')).toBe(VALID); expect(validateMessage('Revert: "release(packaging): something"')).toBe(VALID); + expect(validateMessage('Revert "release(packaging): something"')).toBe(VALID); expect(errors).toEqual([]); }); - it('should fail when scope is invalid', function() { expect(validateMessage('fix(Compiler): something')).toBe(INVALID); expect(validateMessage('feat(bah): something')).toBe(INVALID);