From 435f6eecd273b562c79b9d76bc4109413a7a0f17 Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Tue, 20 Feb 2018 17:11:10 -0800
Subject: [PATCH] build: make git revert messages valid (#22339)

`git revert` default message is "Revert <original message>" (no semi-colon)

PR Close #22339
---
 tools/validate-commit-message/validate-commit-message.js      | 2 +-
 tools/validate-commit-message/validate-commit-message.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);