Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 8 deletions

diff --git a/bin/secpick b/bin/secpick
index 4d056ceecaf..517465d3f5d 100755
--- a/bin/secpick
+++ b/bin/secpick
@@ -25,12 +25,8 @@ module Secpick
       @options[:try] == true
     end
 
-    def original_branch
-      @options[:branch].strip
-    end
-
     def source_branch
-      branch = "#{original_branch}-#{@options[:version]}"
+      branch = "#{@options[:branch]}-#{@options[:version]}"
       branch.prepend("#{BRANCH_PREFIX}-") unless branch.start_with?("#{BRANCH_PREFIX}-")
       branch.freeze
     end
@@ -44,7 +40,7 @@ module Secpick
        "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}"]
+       "git checkout #{@options[:branch]}"]
     end
 
     def gitlab_params
@@ -121,8 +117,8 @@ module Secpick
 
         parser.parse!
 
-        options[:sha] ||= `git rev-parse HEAD`
-        options[:branch] ||= `git rev-parse --abbrev-ref HEAD`
+        options[:sha] ||= `git rev-parse HEAD`.strip
+        options[:branch] ||= `git rev-parse --abbrev-ref HEAD`.strip
         options[:remote] ||= DEFAULT_REMOTE
 
         nil_options = options.select {|_, v| v.nil? }