Skip to content
Snippets Groups Projects

Change the approach to check if patches apply cleanly

Merged Rémy Coutable requested to merge 23372-fix-ce-to-ee-merge-check-task into master
All threads resolved!
Compare and Show latest version
1 file
+ 1
1
Compare changes
  • Side-by-side
  • Inline
@@ -111,7 +111,7 @@ def generate_patch(branch, filepath)
output, status = Gitlab::Popen.popen(%w[git format-patch FETCH_HEAD --stdout])
throw(:halt_check, :ko) unless status.zero?
File.open(filepath, 'w+') { |f| f.write(output) }
File.write(filepath, output)
throw(:halt_check, :ko) unless File.exist?(filepath)
end
Loading