From f3ddb9f4625bb088894c1021339964015f955d38 Mon Sep 17 00:00:00 2001
From: James Lopez <james@gitlab.com>
Date: Mon, 14 May 2018 07:46:04 +0000
Subject: Update secpick to use security branches

---
 bin/secpick | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'bin')

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}"
 
-- 
cgit v1.2.3