summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@gitlab.com>2018-10-24 06:55:16 +0000
committerJames Lopez <james@gitlab.com>2018-10-24 06:55:16 +0000
commit46cfc5402397e92029888c1a4b533dc8723dc124 (patch)
treecc87ef2aa5e3a380452f4d6bc9acad20578a143e
parentb438aeb2f81ce4f25e58f519155328bc8bde83a3 (diff)
downloadgitlab-ce-fix/secpick-ee.tar.gz
Update secpickfix/secpick-ee
-rwxr-xr-xbin/secpick4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/secpick b/bin/secpick
index 991c691314d..2b263d452c9 100755
--- a/bin/secpick
+++ b/bin/secpick
@@ -42,7 +42,9 @@ original_branch = options[:branch].strip
branch = "#{original_branch}-#{options[:version]}"
branch.prepend("#{BRANCH_PREFIX}-") unless branch.start_with?("#{BRANCH_PREFIX}-")
branch = branch.freeze
-stable_branch = ee ? "#{BRANCH_PREFIX}-#{options[:version]}-ee".freeze : "#{BRANCH_PREFIX}-#{options[:version]}".freeze
+stable_branch = "#{BRANCH_PREFIX}-#{options[:version]}".tap do |name|
+ name << "-ee" if ee
+end.freeze
command = "git fetch #{REMOTE} #{stable_branch} && git checkout #{stable_branch} && git pull #{REMOTE} #{stable_branch} && git checkout -B #{branch} && git cherry-pick #{options[:sha]} && git push #{REMOTE} #{branch} && git checkout #{original_branch}"