Automatic merge of gitlab-org/gitlab-ce master

a7d03cf8 · GitLab Bot · 2c4eb4f6 · 11f82c89 · a7d03cf8
Commit a7d03cf8 authored Jul 30, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

bin/secpick bin/secpick +1 -1

No files found.
--- 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}"]