diff options
| -rwxr-xr-x | bin/secpick | 4 |
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}" |