release: added patch

2017-09-19 22:18:18 -04:00
parent ee817d2230
commit 9ff65e7e1e
6 changed files with 47 additions and 7 deletions
--- a/lib/feature/merge.rb
+++ b/lib/feature/merge.rb
@@ -22,7 +22,7 @@ module Feature

      feature_branch  = current_branch

-      error "invalid branch: #{merge_to_branch}" unless standard_branches.include? merge_to_branch
+      error "invalid branch: #{merge_to_branch}" unless standard_branches.include? merge_to_branch or merge_to_branch =~ /\d+\.\d+\.\d+/

      git_checkout merge_to_branch
      git_pull     merge_to_branch