Skip to content

Commit e65dd5f

Browse files
committed
Do not check for JIRA marker in github generated commit message
1 parent 36d76a9 commit e65dd5f

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

main/githooks.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,10 @@ def check_commit_msg(message, files):
764764
does not contain required marker.
765765
766766
'''
767-
if NO_JIRA_MARKER not in message:
767+
if re.match(r'$Merge branch \'.+?\' into .+', message):
768+
# Not checking for JIRA in commit message generated by github
769+
pass
770+
elif NO_JIRA_MARKER not in message:
768771
if jira_id_pattern.search(message) is None:
769772
_fail('Every commit should contain a Jira issue ID or the text '
770773
f'{NO_JIRA_MARKER}')

0 commit comments

Comments
 (0)