[ARVADOS-DEV] created: 88474d0ad55e159de59e35a74cf9686d3e641f92

[git at public.curoverse.com]

        at  88474d0ad55e159de59e35a74cf9686d3e641f92 (commit)


commit 88474d0ad55e159de59e35a74cf9686d3e641f92
Author: Tim Pierce <twp at unchi.org>
Date:   Tue Sep 30 13:10:32 2014 -0400

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

diff --git a/git/hooks/coding-standards.sh b/git/hooks/coding-standards.sh
index bc75a58..79b0cdd 100755
--- 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

-----------------------------------------------------------------------


hooks/post-receive
--