gitscape 1.5.4 → 1.5.5
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/gitscape/base.rb +4 -5
- data/lib/gitscape/version.rb +1 -1
- metadata +2 -2
data/lib/gitscape/base.rb
CHANGED
@@ -103,12 +103,11 @@ class Gitscape::Base
|
|
103
103
|
hotfix_branch: the name of the hotfix branch to finish.
|
104
104
|
if ommitted, you must currently be on a hotfix branch"
|
105
105
|
|
106
|
+
hotfix_branch = "hotfix/#{hotfix_branch}"
|
107
|
+
|
106
108
|
previous_branch = current_branch_name
|
107
|
-
|
108
|
-
|
109
|
-
hotfix_branch ||= previous_branch
|
110
|
-
else
|
111
|
-
hotfix_branch = "hotfix/#{hotfix_branch}"
|
109
|
+
if previous_branch.to_s.start_with? "hotfix/"
|
110
|
+
hotfix_branch = previous_branch
|
112
111
|
end
|
113
112
|
|
114
113
|
if hotfix_branch.to_s.empty?
|
data/lib/gitscape/version.rb
CHANGED