[ARVADOS-DEV] updated: 760afe4c383fc4136c949c26b0f3b14169e1e2ca

[git at public.curoverse.com]

Summary of changes:
 git/hooks/coding-standards.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

       via  760afe4c383fc4136c949c26b0f3b14169e1e2ca (commit)
      from  6ed1a66a9ea26c74a60643c1c99191f2bb43a1c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 760afe4c383fc4136c949c26b0f3b14169e1e2ca
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jun 5 11:26:01 2014 -0400

    Added pattern to permit commits that merge master heads.

diff --git a/git/hooks/coding-standards.sh b/git/hooks/coding-standards.sh
index f8bb91b..18c050d 100755
--- a/git/hooks/coding-standards.sh
+++ b/git/hooks/coding-standards.sh
@@ -23,6 +23,7 @@ $regex = /\[ref: (\d+)\]/
 $broken_commit_message = /Please enter a commit message to explain why this merge is necessary/
 $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
 
 # enforced custom commit message format
@@ -45,10 +46,11 @@ def check_message_format
       puts "\n******************************************************************\n"
       puts "\n\n"
       broken = true
-    elsif not $merge_master.match(message)
+    elsif not $merge_master.match(message) and not $pull_merge.match(message)
       puts "\n[POLICY] This does not appear to be a merge of a feature\n"
-      puts "\nbranch into master, or it does not follow the required\n"
-      puts "\nformat \"Merge branch 'feature-branch'\".\n\n"
+      puts "\nbranch into master or a merge of master heads.  Merges must follow\n"
+      puts "\nthe format \"Merge branch 'feature-branch'\" or\n"
+      puts "\n\"Merge branch 'master' of git.example.com:repository\".\n\n"
       puts "\n******************************************************************\n"
       puts "\nOffending commit: #{rev}\n\n"
       puts "\nOffending commit message:\n\n"

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


hooks/post-receive
--