diff options
| author | James Lopez <james@gitlab.com> | 2018-05-14 07:57:53 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2018-05-14 07:57:53 +0000 |
| commit | 02e7962ad410762b9b3ab5172f442ef35e91b1c1 (patch) | |
| tree | 86f4ea14531002a77d55de31c7ec0dbb8cf3072a | |
| parent | a758352bb11a41d054edce766348a83b20d92f9d (diff) | |
| download | gitlab-ce-02e7962ad410762b9b3ab5172f442ef35e91b1c1.tar.gz | |
Update secpick
| -rwxr-xr-x | bin/secpick | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/secpick b/bin/secpick index c4c7aadc92b..5029fe57cfe 100755 --- a/bin/secpick +++ b/bin/secpick @@ -38,7 +38,7 @@ abort("Wrong version format #{options[:version].bold}".red) unless options[:vers branch = [BRANCH_PREFIX, options[:branch], options[:version]].join('-').freeze stable_branch = "#{BRANCH_PREFIX}-#{options[:version]}".freeze -command = ""git fetch #{REMOTE} #{stable_branch} && git checkout #{stable_branch} && git pull #{REMOTE} #{stable_branch} && git checkout -B #{branch} && git cherry-pick #{options[:sha]} && git push #{REMOTE} #{branch}" +command = "git fetch #{REMOTE} #{stable_branch} && git checkout #{stable_branch} && git pull #{REMOTE} #{stable_branch} && git checkout -B #{branch} && git cherry-pick #{options[:sha]} && git push #{REMOTE} #{branch}" _stdin, stdout, stderr = Open3.popen3(command) |