diff options
author | Nick Thomas <nick@gitlab.com> | 2019-02-14 19:29:31 +0300 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-02-14 19:29:31 +0300 |
commit | 6d1273cf2afb5ee72110e575ba537569670cf8fb (patch) | |
tree | 360faac64ffd2d029bed9375e9af52b8b671887b | |
parent | 482b91d5195b223c0e0e687ffba9d0a53f4378d5 (diff) | |
parent | bba8dc7d6725bbe30625d47f73ecaf59f6072e3b (diff) |
Merge branch 'simplify-secpick-git-commands' into 'master'
Simplify bin/secpick git commands
See merge request gitlab-org/gitlab-ce!25240
-rwxr-xr-x | bin/secpick | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/bin/secpick b/bin/secpick index 8f956d300a7..99f4e871f72 100755 --- a/bin/secpick +++ b/bin/secpick @@ -45,9 +45,7 @@ module Secpick def git_commands ["git fetch #{@options[:remote]} #{stable_branch}", - "git checkout #{stable_branch}", - "git pull #{@options[:remote]} #{stable_branch}", - "git checkout -B #{source_branch}", + "git checkout -B #{source_branch} #{@options[:remote]}/#{stable_branch}", "git cherry-pick #{@options[:sha]}", "git push #{@options[:remote]} #{source_branch}", "git checkout #{original_branch}"] |