diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-16 15:34:04 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-16 15:52:32 +0200 |
| commit | 992dfd7eb4c5bf26517d5d5adf3b3b9894ac397e (patch) | |
| tree | e7c44a0f291839da18712abd944e0675eb34e833 | |
| parent | 3d44ec3f4aa7180f2226f09064abe281c6b9d7be (diff) | |
| download | gitlab-ce-32085-improve-ee-compat-check.tar.gz | |
Fetch CE/branch before running `git apply --check --3way patch`32085-improve-ee-compat-check
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index 06438d2df41..198896220ac 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -131,10 +131,12 @@ module Gitlab def check_patch(patch_path) step("Checking out master", %w[git checkout master]) step("Resetting to latest master", %w[git reset --hard origin/master]) + step("Fetching CE/#{branch}", %W[git fetch #{CE_REPO} #{branch}]) step( "Checking if #{patch_path} applies cleanly to EE/master", %W[git apply --check --3way #{patch_path}] ) do |output, status| + puts output unless status.zero? @failed_files = output.lines.reduce([]) do |memo, line| if line.start_with?('error: patch failed:') @@ -309,12 +311,12 @@ module Gitlab U lib/gitlab/ee_compat_check.rb Resolve them, stage the changes and commit them. - + If the patch couldn't be applied cleanly, use the following command: - + # In the EE repo $ git apply --reject path/to/#{ce_branch}.patch - + This option makes git apply the parts of the patch that are applicable, and leave the rejected hunks in corresponding `.rej` files. You can then resolve the conflicts highlighted in `.rej` by |