Commit 11f82c89 authored by Stan Hu's avatar Stan Hu

Merge branch 'fix-secpick' into 'master'

Fix secpick pushing to stable branch

See merge request gitlab-org/gitlab-ce!31275
parents 5a221665 96f8a282
...@@ -45,7 +45,7 @@ module Secpick ...@@ -45,7 +45,7 @@ module Secpick
def git_commands def git_commands
["git fetch #{@options[:remote]} #{stable_branch}", ["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 cherry-pick #{@options[:sha]}",
"git push #{@options[:remote]} #{source_branch}", "git push #{@options[:remote]} #{source_branch}",
"git checkout #{original_branch}"] "git checkout #{original_branch}"]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment