[ARVADOS-DEV] created: 6ed1a66a9ea26c74a60643c1c99191f2bb43a1c5

[git at public.curoverse.com]

        at  6ed1a66a9ea26c74a60643c1c99191f2bb43a1c5 (commit)


commit 6ed1a66a9ea26c74a60643c1c99191f2bb43a1c5
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jun 5 11:09:54 2014 -0400

    Proposed new git hook policy: only applies to first-parent, enforces master is
    first parent on all merges, enforces issue number (or explicitly stating no
    issue number) on all master commits.

diff --git a/git/hooks/coding-standards.sh b/git/hooks/coding-standards.sh
index de8c49f..f8bb91b 100755
--- a/git/hooks/coding-standards.sh
+++ b/git/hooks/coding-standards.sh
@@ -21,43 +21,74 @@ puts "Enforcing Policies... \n(#{$refname}) (#{$oldrev[0,6]}) (#{$newrev[0,6]})"
 $regex = /\[ref: (\d+)\]/
 
 $broken_commit_message = /Please enter a commit message to explain why this merge is necessary/
-
-$merge_commit = /Merge branch/
-$merge_master_commit = /Merge branch 'master' (of|into)/
-$refs_or_closes_found = /(refs #|closes #)/i
-
-# If the next command has output, this is a non-merge commit.
-#`git rev-list --max-parents=1 --first-parent #{$oldrev}..#{$newrev}`
+$wrong_way_merge_master = /Merge( remote-tracking)? branch '([^\/]+\/)?master' into/
+$merge_master = /Merge branch '[^']+'((?! into)| into master)/
+$refs_or_closes_or_no_issue = /(refs #|closes #|no issue #)/i
 
 # enforced custom commit message format
 def check_message_format
-  missed_revs = `git rev-list #{$oldrev}..#{$newrev}`.split("\n")
-  missed_revs.each do |rev|
+  all_revs    = `git rev-list --first-parent #{$oldrev}..#{$newrev}`.split("\n")
+  merge_revs  = `git rev-list --first-parent --min-parents=2 #{$oldrev}..#{$newrev}`.split("\n")
+  # single_revs = `git rev-list --first-parent --max-parents=1 #{$oldrev}..#{$newrev}`.split("\n")
+  broken = false
+
+  merge_revs.each do |rev|
+    message = `git cat-file commit #{rev} | sed '1,/^$/d'`
+    if $wrong_way_merge_master.match(message)
+      puts "\n[POLICY] This appears to be a merge from master into a feature\n"
+      puts "\nbranch.  Commits to master must merge from the feature\n"
+      puts "\nbranch into master.\n\n"
+      puts "\n******************************************************************\n"
+      puts "\nOffending commit: #{rev}\n\n"
+      puts "\nOffending commit message:\n\n"
+      puts message
+      puts "\n******************************************************************\n"
+      puts "\n\n"
+      broken = true
+    elsif not $merge_master.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 "\n******************************************************************\n"
+      puts "\nOffending commit: #{rev}\n\n"
+      puts "\nOffending commit message:\n\n"
+      puts message
+      puts "\n******************************************************************\n"
+      puts "\n\n"
+      broken = true
+    end
+  end
+
+  all_revs.each do |rev|
     message = `git cat-file commit #{rev} | sed '1,/^$/d'`
     if $broken_commit_message.match(message)
-      puts "\n[POLICY] Please avoid broken commit messages, rejected\n\n"
-			puts "\n******************************************************************\n"
-			puts "\nOffending commit: #{rev}\n\n"
-			puts "\nOffending commit message:\n\n"
-			puts message
-			puts "\n******************************************************************\n"
-			puts "\n\n"
-      exit 1
+      puts "\n[POLICY] Rejected broken commit message for including boilerplate\n"
+      puts "\ninstruction text.\n\n"
+      puts "\n******************************************************************\n"
+      puts "\nOffending commit: #{rev}\n\n"
+      puts "\nOffending commit message:\n\n"
+      puts message
+      puts "\n******************************************************************\n"
+      puts "\n\n"
+      broken = true
+    end
+
+    if not $refs_or_closes_or_no_issue.match(message)
+      puts "\n[POLICY] All commits to master must include an issue (\"refs #\" or\n"
+      puts "\n\"closes #\") or specify \"no issue #\"\n\n"
+      puts "\n******************************************************************\n"
+      puts "\nOffending commit: #{rev}\n\n"
+      puts "\nOffending commit message:\n\n"
+      puts message
+      puts "\n******************************************************************\n"
+      puts "\n\n"
+      broken = true
     end
-		if $merge_commit.match(message) and 
-				not $merge_master_commit.match(message) and
-				not $refs_or_closes_found.match(message)
-			puts "\n[POLICY] Please make sure to refer to an issue in all branch merge commits, rejected\n\n"
-			puts "\n******************************************************************\n"
-			puts "\nOffending commit: #{rev}\n\n"
-			puts "\nOffending commit message:\n\n"
-			puts message
-			puts "\n******************************************************************\n"
-			puts "\n\n"
-      exit 1
-		end
+  end
+
+  if broken
+    exit 1
   end
 end
 
 check_message_format
-

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


hooks/post-receive
--