Commit 4282e610 authored by Rémy Coutable's avatar Rémy Coutable

Generate patch with git diff instead of git format-patch

This will generate a patch:

- that is smaller
- that applies more cleanly since only the final diff will be applied
  instead of each commit's diff
Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 32059018
...@@ -76,13 +76,9 @@ module Gitlab ...@@ -76,13 +76,9 @@ module Gitlab
step( step(
"Generating the patch against origin/master in #{patch_path}", "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| ) do |output, status|
throw(:halt_check, :ko) unless status.zero? throw(:halt_check, :ko) unless status.zero? && File.exist?(patch_path)
File.write(patch_path, output)
throw(:halt_check, :ko) unless File.exist?(patch_path)
end end
end end
...@@ -296,7 +292,7 @@ module Gitlab ...@@ -296,7 +292,7 @@ module Gitlab
# In the CE repo # In the CE repo
$ git fetch origin master $ 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 # In the EE repo
$ git fetch origin master $ git fetch origin master
......
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