4038: add "fixes #" to acceptable merge commit messages

diff --git a/git/hooks/coding-standards.sh b/git/hooks/coding-standards.sh
index bc75a582ebc82c17e71b7c014717e85929210a4d..79b0cdd3cb99903648fb80c6a24c51beb86156cd 100755 (executable)
--- a/git/hooks/coding-standards.sh
+++ b/git/hooks/coding-standards.sh
@@ -24,7 +24,7 @@ $broken_commit_message = /Please enter a commit message to explain why this merg
 $wrong_way_merge_master = /Merge( remote-tracking)? branch '([^\/]+\/)?master' into/
 $merge_master = /Merge branch '[^']+'((?! into)| into master)/
 $pull_merge = /Merge branch 'master' of /
-$refs_or_closes_or_no_issue = /(refs #|closes #|no issue #)/i
+$refs_or_closes_or_no_issue = /(refs #|closes #|fixes #|no issue #)/i
 
 # enforced custom commit message format
 def check_message_format