diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-22 19:00:49 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-22 19:00:49 +0300 |
| commit | 23e43ec5b18b35e6fe92adcbf3ca3d9a51a210b9 (patch) | |
| tree | 82a526c3e4cb81f5e033bb2c95ec2f35516f3aba /lib/gitlab | |
| parent | 91335c59fd3a0a1dc5cd83835d086ac1699316b9 (diff) | |
Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag
This should solve 99% of the false-positive of the `ee_compat_check` job.
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 2 |
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| |