diff options
author | Stan Hu <stanhu@gmail.com> | 2019-07-30 13:07:58 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-07-30 13:07:58 +0000 |
commit | 11f82c891ab82620982ef157d3a6783ee56a6997 (patch) | |
tree | ce1273429204bec5c8524ff81cca24658bf79ced | |
parent | 5a221665bedc2366b30b2a2b0f777ead657c6143 (diff) | |
parent | 96f8a282c6ad1a598b4720c38a34646d0dc0439e (diff) | |
download | gitlab-ce-11f82c891ab82620982ef157d3a6783ee56a6997.tar.gz |
Merge branch 'fix-secpick' into 'master'
Fix secpick pushing to stable branch
See merge request gitlab-org/gitlab-ce!31275
-rwxr-xr-x | bin/secpick | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/secpick b/bin/secpick index d01304285b6..8a61356a088 100755 --- a/bin/secpick +++ b/bin/secpick @@ -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}"] |