summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-02-22 16:00:49 +0000
committerRémy Coutable <remy@rymai.me>2017-02-22 16:00:49 +0000
commit23e43ec5b18b35e6fe92adcbf3ca3d9a51a210b9 (patch)
tree82a526c3e4cb81f5e033bb2c95ec2f35516f3aba /lib
parent91335c59fd3a0a1dc5cd83835d086ac1699316b9 (diff)
downloadgitlab-ce-23e43ec5b18b35e6fe92adcbf3ca3d9a51a210b9.tar.gz
Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag improve-ee_compat_check-by-using-git-apply-3way-flag
This should solve 99% of the false-positive of the `ee_compat_check` job.
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ee_compat_check.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index c8e36d8ff4a..e0fdf3f3d64 100644
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -119,7 +119,7 @@ module Gitlab
step("Reseting to latest master", %w[git reset --hard origin/master])
step("Checking if #{patch_path} applies cleanly to EE/master")
- output, status = Gitlab::Popen.popen(%W[git apply --check #{patch_path}])
+ output, status = Gitlab::Popen.popen(%W[git apply --check --3way #{patch_path}])
unless status.zero?
failed_files = output.lines.reduce([]) do |memo, line|