summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJames Lopez <james@gitlab.com>2018-05-14 07:46:04 +0000
committerJames Lopez <james@gitlab.com>2018-05-14 07:46:04 +0000
commitf3ddb9f4625bb088894c1021339964015f955d38 (patch)
tree5bd853674eda3bb4d2c5aea6bdd68b2b9b13ba5a /bin
parent44e64a04beed89e08981352430efc13258b9aae8 (diff)
downloadgitlab-ce-f3ddb9f4625bb088894c1021339964015f955d38.tar.gz
Update secpick to use security branches
Diffstat (limited to 'bin')
-rwxr-xr-xbin/secpick3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/secpick b/bin/secpick
index 76ae231e913..5caa0fb66b5 100755
--- a/bin/secpick
+++ b/bin/secpick
@@ -5,7 +5,6 @@ require 'rainbow/refinement'
using Rainbow
BRANCH_PREFIX = 'security'.freeze
-STABLE_BRANCH_SUFFIX = 'stable'.freeze
REMOTE = 'dev'.freeze
options = { version: nil, branch: nil, sha: nil }
@@ -37,7 +36,7 @@ abort("Missing options. Use #{$0} --help to see the list of options available".r
abort("Wrong version format #{options[:version].bold}".red) unless options[:version] =~ /\A\d*\-\d*\Z/
branch = [BRANCH_PREFIX, options[:branch], options[:version]].join('-').freeze
-stable_branch = "#{options[:version]}-#{STABLE_BRANCH_SUFFIX}".freeze
+stable_branch = "#{BRANCH_PREFIX}-#{options[:version]}".freeze
command = "git checkout #{stable_branch} && git pull #{REMOTE} #{stable_branch} && git checkout -B #{branch} && git cherry-pick #{options[:sha]} && git push #{REMOTE} #{branch}"