Merge branch '33525-use-git-diff-instead-of-git-format-patch' into 'master'

Generate patch with git diff instead of git format-patch

Closes #33525

See merge request !12060

1 files changed, 3 insertions, 7 deletions

diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index 38e27513281..6d326ee213a 100644
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -76,13 +76,9 @@ module Gitlab
 
       step(
         "Generating the patch against origin/master in #{patch_path}",
-        %w[git format-patch origin/master --stdout]
+        %W[git diff --binary origin/master > #{patch_path}]
       ) do |output, status|
-        throw(:halt_check, :ko) unless status.zero?
-
-        File.write(patch_path, output)
-
-        throw(:halt_check, :ko) unless File.exist?(patch_path)
+        throw(:halt_check, :ko) unless status.zero? && File.exist?(patch_path)
       end
     end
 
@@ -296,7 +292,7 @@ module Gitlab
 
           # In the CE repo
           $ git fetch origin master
-          $ git format-patch origin/master --stdout > #{ce_branch}.patch
+          $ git diff --binary origin/master > #{ce_branch}.patch
 
           # In the EE repo
           $ git fetch origin master