Commit 23e43ec5 authored by Rémy Coutable's avatar Rémy Coutable

Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag

This should solve 99% of the false-positive of the `ee_compat_check` job.
parent 91335c59
......@@ -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|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment