lib/gitscape/base.rb in gitscape-1.3.1 vs lib/gitscape/base.rb in gitscape-1.3.2

@@ -100,11 +100,11 @@
     end
 
     merge_master = true
     master_branch = @repo.branch "master"
 
-    if hotfix_branch_name.empty?
+    if hotfix_branch_name.to_s.empty?
       puts "!!! not currently on a hotfix branch, and no branch name was provided as an argument !!!"
       puts usage_string
       exit 1
     end
 
@@ -113,10 +113,10 @@
     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_branches << master_branch if !(merge_branches.include? master_branch) && merge_master
 
     # Merge the hotfix into branches
     for branch in merge_branches
       merge_options = @merge_options
       merge_options += " --log" if branch == "master"