gitscape 1.3 → 1.3.1

data/lib/gitscape/base.rb

@@ -76,7 +76,10 @@ class Gitscape::Base
 
     hotfix_branch_name = "hotfix/#{hotfix_branch_name}"
     puts "Creating hotfix branch '#{hotfix_branch_name}'..."
-    @repo.checkout(@repo.branch(hotfix_branch_name).create)
+
+    hotfix_branch = @repo.branch(hotfix_branch_name)
+    `git checkout -b #{hotfix_branch.full}`
+    @repo.checkout(hotfix_branch)
   end
 
   def hotfix_finish(hotfix_branch_name=nil)
@@ -97,6 +100,7 @@ class Gitscape::Base
     end
 
     merge_master = true
+    master_branch = @repo.branch "master"
 
     if hotfix_branch_name.empty?
       puts "!!! not currently on a hotfix branch, and no branch name was provided as an argument !!!"
@@ -106,11 +110,12 @@ class Gitscape::Base
 
     hotfix_branch = @repo.branch hotfix_branch_name
     development_branch = @repo.branches.select {|branch| branch.full.start_with? "release/"}.sort.last
-    development_branch = @repo.branch "master" if development_branch == nil
+    development_branch = master_branch if development_branch == nil
     live_branch = @repo.branch "live"
 
     # Collect the set of branches we'd like to merge the hotfix into
     merge_branches = [development_branch, live_branch]
+    merge_branches.insert master_branch if !(merge_branches.include? master_branch) && merge_master
 
     # Merge the hotfix into branches
     for branch in merge_branches

data/lib/gitscape/version.rb

@@ -1,3 +1,3 @@
 module Gitscape
-  VERSION = '1.3'
+  VERSION = '1.3.1'
 end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  version: "1.3"
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Jon Botelho
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-08 00:00:00 -05:00
+date: 2013-01-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency