Do not validate merge commit message #24

mangolang · Apr 28, 2018 · 9a1219b · 9a1219b
1 parent 9b83ee9
commit 9a1219b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dev/hooks/utils/message_validation.py b/dev/hooks/utils/message_validation.py
@@ -24,8 +24,6 @@ def __init__(self, msg):
 
 
 def validate_title(title):
-	if title[:5].lower() == 'merge':
-		return
 	if title[0] in string.ascii_lowercase:
 		raise ValidationError('Commit message title should start with a capital letter')
 	if title[-1] == '.':
@@ -64,6 +62,8 @@ def validate_tags(tags):
 
 
 def validate_commit_message(msg):
+	if msg[:5].lower() == 'merge':
+		return
 	title, tags, body = split_msg(msg)
 	validate_title(title)
 	validate_tags(tags)