gitscape 1.3 → 1.3.1
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/gitscape/base.rb +7 -2
- data/lib/gitscape/version.rb +1 -1
- metadata +3 -2
data/lib/gitscape/base.rb
CHANGED
@@ -76,7 +76,10 @@ class Gitscape::Base
|
|
76
76
|
|
77
77
|
hotfix_branch_name = "hotfix/#{hotfix_branch_name}"
|
78
78
|
puts "Creating hotfix branch '#{hotfix_branch_name}'..."
|
79
|
-
|
79
|
+
|
80
|
+
hotfix_branch = @repo.branch(hotfix_branch_name)
|
81
|
+
`git checkout -b #{hotfix_branch.full}`
|
82
|
+
@repo.checkout(hotfix_branch)
|
80
83
|
end
|
81
84
|
|
82
85
|
def hotfix_finish(hotfix_branch_name=nil)
|
@@ -97,6 +100,7 @@ class Gitscape::Base
|
|
97
100
|
end
|
98
101
|
|
99
102
|
merge_master = true
|
103
|
+
master_branch = @repo.branch "master"
|
100
104
|
|
101
105
|
if hotfix_branch_name.empty?
|
102
106
|
puts "!!! not currently on a hotfix branch, and no branch name was provided as an argument !!!"
|
@@ -106,11 +110,12 @@ class Gitscape::Base
|
|
106
110
|
|
107
111
|
hotfix_branch = @repo.branch hotfix_branch_name
|
108
112
|
development_branch = @repo.branches.select {|branch| branch.full.start_with? "release/"}.sort.last
|
109
|
-
development_branch =
|
113
|
+
development_branch = master_branch if development_branch == nil
|
110
114
|
live_branch = @repo.branch "live"
|
111
115
|
|
112
116
|
# Collect the set of branches we'd like to merge the hotfix into
|
113
117
|
merge_branches = [development_branch, live_branch]
|
118
|
+
merge_branches.insert master_branch if !(merge_branches.include? master_branch) && merge_master
|
114
119
|
|
115
120
|
# Merge the hotfix into branches
|
116
121
|
for branch in merge_branches
|
data/lib/gitscape/version.rb
CHANGED
metadata
CHANGED
@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 1
|
7
7
|
- 3
|
8
|
-
|
8
|
+
- 1
|
9
|
+
version: 1.3.1
|
9
10
|
platform: ruby
|
10
11
|
authors:
|
11
12
|
- Jon Botelho
|
@@ -13,7 +14,7 @@ autorequire:
|
|
13
14
|
bindir: bin
|
14
15
|
cert_chain: []
|
15
16
|
|
16
|
-
date: 2013-01-
|
17
|
+
date: 2013-01-14 00:00:00 -05:00
|
17
18
|
default_executable:
|
18
19
|
dependencies:
|
19
20
|
- !ruby/object:Gem::Dependency
|