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

@@ -107,11 +107,12 @@
       puts usage_string
       exit 1
     end
 
     hotfix_branch = @repo.branch hotfix_branch_name
-    development_branch = @repo.branches.select {|branch| branch.full.start_with? "release/"}.sort.last
+    # TODO The next line breaks at iteration 100
+    development_branch = @repo.branches.select {|branch| branch.full.start_with? "release/"}.sort{|a, b| a.name <=> b.name}.last
     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]
@@ -303,12 +304,13 @@
     min_version = split_version(min_version)
 
     raise "Git version string must have 4 parts" if min_version.size != 4
 
     4.times do |i|
-      return false unless local_version[i] >= min_version[i]
+      next if local_version[i] == min_version[i]
+      return local_version[i] > min_version[i]
     end
-    true
+    true # If you get all the way here, all 4 positions match precisely
   end
 
   def self.result_ok?(result)
     if result.nil? or result == 0
       puts "done"