From ddea3b9a3f2248cd200a4dcd9e718530354857e7 Mon Sep 17 00:00:00 2001 From: Zandor Smith Date: Wed, 2 Oct 2019 21:55:17 +0200 Subject: [PATCH] Disable the rebase error for if there are merge commits in the PR commit history. We use squish and rebase anyway to merge PRs into master so this doesn't matter. --- Dangerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dangerfile b/Dangerfile index c385537b..0de33f3c 100755 --- a/Dangerfile +++ b/Dangerfile @@ -7,9 +7,10 @@ warn "PR is classed as Work in Progress" if github.pr_title.include? "[WIP]" warn "Big PR, consider splitting into smaller" 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 +#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 +# Disabled because currently we use squish and rebase instead of carrying over the commit history. This doesn't matter for the main repo. # Mainly to encourage writing up some reasoning about the PR, rather than # just leaving a title