Read about our upcoming Code of Conduct on this issue

Commit 972b77f7 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'improve-ee_compat_check-by-using-git-apply-3way-flag' into 'master'

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

See merge request !9447
......@@ -119,7 +119,7 @@ def check_patch(patch_path)
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