gitscape 1.3.1 → 1.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/gitscape/base.rb +2 -2
- data/lib/gitscape/version.rb +1 -1
- metadata +3 -3
data/lib/gitscape/base.rb
CHANGED
|
@@ -102,7 +102,7 @@ class Gitscape::Base
|
|
|
102
102
|
merge_master = true
|
|
103
103
|
master_branch = @repo.branch "master"
|
|
104
104
|
|
|
105
|
-
if hotfix_branch_name.empty?
|
|
105
|
+
if hotfix_branch_name.to_s.empty?
|
|
106
106
|
puts "!!! not currently on a hotfix branch, and no branch name was provided as an argument !!!"
|
|
107
107
|
puts usage_string
|
|
108
108
|
exit 1
|
|
@@ -115,7 +115,7 @@ class Gitscape::Base
|
|
|
115
115
|
|
|
116
116
|
# Collect the set of branches we'd like to merge the hotfix into
|
|
117
117
|
merge_branches = [development_branch, live_branch]
|
|
118
|
-
merge_branches
|
|
118
|
+
merge_branches << master_branch if !(merge_branches.include? master_branch) && merge_master
|
|
119
119
|
|
|
120
120
|
# Merge the hotfix into branches
|
|
121
121
|
for branch in merge_branches
|
data/lib/gitscape/version.rb
CHANGED
metadata
CHANGED
|
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
|
5
5
|
segments:
|
|
6
6
|
- 1
|
|
7
7
|
- 3
|
|
8
|
-
-
|
|
9
|
-
version: 1.3.
|
|
8
|
+
- 2
|
|
9
|
+
version: 1.3.2
|
|
10
10
|
platform: ruby
|
|
11
11
|
authors:
|
|
12
12
|
- Jon Botelho
|
|
@@ -14,7 +14,7 @@ autorequire:
|
|
|
14
14
|
bindir: bin
|
|
15
15
|
cert_chain: []
|
|
16
16
|
|
|
17
|
-
date: 2013-01-
|
|
17
|
+
date: 2013-01-28 00:00:00 -05:00
|
|
18
18
|
default_executable:
|
|
19
19
|
dependencies:
|
|
20
20
|
- !ruby/object:Gem::Dependency
|