diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-07-30 10:51:29 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-07-30 10:51:29 +0000 |
| commit | 96f8a282c6ad1a598b4720c38a34646d0dc0439e (patch) | |
| tree | 44a2c0c4902bbf710842c6c27cdd33d315e8fb4a | |
| parent | cab3b77049e70435d7ebf98f1b4b0f634c0219f4 (diff) | |
| download | gitlab-ce-fix-secpick.tar.gz | |
Fix secpick pushing to stable branchfix-secpick
| -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}"] |