From 3262378e240880b8dcadd83b0dd7fca2c618f146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Wed, 22 Nov 2017 23:30:31 +0100 Subject: In EeCompatCheck, always reset to canonical-ee/master when applying a patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- lib/gitlab/ee_compat_check.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index 66b2c60e8eb..4a9d3e52fae 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -102,7 +102,7 @@ module Gitlab end def ce_branch_compat_check! - if check_patch(ce_patch_full_path, remote: 'canonical-ce').zero? + if check_patch(ce_patch_full_path).zero? puts applies_cleanly_msg(ce_branch) throw(:halt_check) end @@ -129,7 +129,7 @@ module Gitlab end def ee_branch_compat_check! - unless check_patch(ee_patch_full_path, remote: 'canonical-ee').zero? + unless check_patch(ee_patch_full_path).zero? puts puts ee_branch_doesnt_apply_cleanly_msg @@ -140,9 +140,9 @@ module Gitlab puts applies_cleanly_msg(ee_branch_found) end - def check_patch(patch_path, remote:) + def check_patch(patch_path) step("Checking out master", %w[git checkout master]) - step("Resetting to latest master", %W[git reset --hard #{remote}/master]) + step("Resetting to latest master", %w[git reset --hard canonical-ee/master]) step( "Checking if #{patch_path} applies cleanly to EE/master", # Don't use --check here because it can result in a 0-exit status even -- cgit v1.2.1