Add Danger check against merge commits

Fix realm#1766
romainfrancez · Aug 14, 2017 · 491693f · 491693f
1 parent 442df0d
commit 491693f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Dangerfile b/Dangerfile
@@ -3,6 +3,11 @@ require 'open3'
 # Warn when there is a big PR
 warn('Big PR') if git.lines_of_code > 500
 
+# Ensure a clean commits history
+if git.commits.any? { |c| c.message =~ /^Merge branch '#{github.branch_for_base}'/ }
+  fail('Please rebase to get rid of the merge commits in this PR')
+end
+
 modified_files = git.modified_files + git.added_files
 
 # Sometimes its a README fix, or something like that - which isn't relevant for