aboutsummaryrefslogtreecommitdiffstats
path: root/validate-commit-msg.js
diff options
context:
space:
mode:
authorMisko Hevery2013-01-17 22:56:42 -0800
committerMisko Hevery2013-01-17 23:52:46 -0800
commit61315211da5d85d73c24169d78e060fb256670e3 (patch)
tree2768c53db714955405a46f967fc85a1258f534fb /validate-commit-msg.js
parentaf89daf4641f57b92be6c1f3635f5a3237f20c71 (diff)
downloadangular.js-61315211da5d85d73c24169d78e060fb256670e3.tar.bz2
fix(git-validator): support fixup and better errors
Diffstat (limited to 'validate-commit-msg.js')
-rwxr-xr-xvalidate-commit-msg.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/validate-commit-msg.js b/validate-commit-msg.js
index 7e8df6be..ec853a46 100755
--- a/validate-commit-msg.js
+++ b/validate-commit-msg.js
@@ -13,7 +13,7 @@ var util = require('util');
var MAX_LENGTH = 70;
-var PATTERN = /^(\w*)(\(([\w\$\.\-\*/]*)\))?\: (.*)$/;
+var PATTERN = /^(?:fixup!\s*)?(\w*)(\(([\w\$\.\-\*/]*)\))?\: (.*)$/;
var IGNORED = /^WIP\:/;
var TYPES = {
feat: true,
@@ -51,7 +51,7 @@ var validateMessage = function(message) {
var match = PATTERN.exec(message);
if (!match) {
- error('does not match "<type>(<scope>): <subject>" !');
+ error('does not match "<type>(<scope>): <subject>" ! was: ' + message);
return false;
}