logburn/git-utilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release: added patch

Browse Source
This commit is contained in:
rkiel
2017-09-19 22:18:18 -04:00
parent ee817d2230
commit 9ff65e7e1e
6 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/feature/merge.rb
View File

@@ -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

2
lib/feature/start.rb
View File

@@ -17,7 +17,7 @@ module Feature
feature_name = feature_words.join('-')
feature_branch = "#{ENV['FEATURE_USER']||ENV['USER']}-#{current_branch}-#{feature_name}"
error "invalid base branch: #{current_branch}" unless standard_branches.include? current_branch
error "invalid base branch: #{current_branch}" unless standard_branches.include? current_branch or current_branch =~ /\d+\.\d+\.\d+/
error "invalid feature branch: #{feature_name}" if standard_branches.include? feature_name
git_pull current_branch