Merge branch 'fix-secpick' into 'master'

Fix secpick pushing to stable branch

See merge request gitlab-org/gitlab-ce!31275
This commit is contained in:
Stan Hu 2019-07-30 13:07:58 +00:00
commit 11f82c891a

View file

@ -45,7 +45,7 @@ module Secpick
def git_commands
["git fetch #{@options[:remote]} #{stable_branch}",
"git checkout -B #{source_branch} #{@options[:remote]}/#{stable_branch}",
"git checkout -B #{source_branch} #{@options[:remote]}/#{stable_branch} --no-track",
"git cherry-pick #{@options[:sha]}",
"git push #{@options[:remote]} #{source_branch}",
"git checkout #{original_branch}"]