diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-05-17 22:17:20 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-05-17 22:17:20 +0000 |
| commit | d3adee5105d4c7745b03ad23999d20fd42b3c575 (patch) | |
| tree | b1a67f0dfec96ab4ada3e5363317ce408269e46b /bin/secpick | |
| parent | f214efb87bd345490277b9962b43752c095c0b2c (diff) | |
| parent | d6c8a55189d62430c7ca4ffa6e5bb63f15a7efc1 (diff) | |
| download | gitlab-ce-sh-move-delete-groups-api-async.tar.gz | |
Merge branch 'master' into 'sh-move-delete-groups-api-async'sh-move-delete-groups-api-async
# Conflicts:
# lib/api/v3/groups.rb
Diffstat (limited to 'bin/secpick')
| -rwxr-xr-x | bin/secpick | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/secpick b/bin/secpick index 76ae231e913..5029fe57cfe 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,9 +36,9 @@ 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}" +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}" _stdin, stdout, stderr = Open3.popen3(command) |