summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-05-17 15:17:02 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-05-17 15:17:02 -0400
commit611c2fb0bc1dea8ff8e47b8a62354ca9a1c002d7 (patch)
treea68ab7ba99827a472c8a5fca885b761bd7d5a8a3 /lib
parent319cab4115380d3bff1e6543b759e785aa36a666 (diff)
downloadgitlab-ce-611c2fb0bc1dea8ff8e47b8a62354ca9a1c002d7.tar.gz
Fix invalid object reference in ee_compat_check scriptrs-fix-ee-compat
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ee_compat_check.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index 198896220ac..38e27513281 100644
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -131,7 +131,7 @@ 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("Fetching CE/#{ce_branch}", %W[git fetch #{CE_REPO} #{ce_branch}])
step(
"Checking if #{patch_path} applies cleanly to EE/master",
%W[git apply --check --3way #{patch_path}]