From f753b647d3966661b9a3572c78012922b4dd6e59 Mon Sep 17 00:00:00 2001 From: rkiel Date: Sat, 7 Oct 2017 10:25:16 -0400 Subject: [PATCH] 6-leave: added confirmation --- lib/release/leave.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/release/leave.rb b/lib/release/leave.rb index 7cda329..59e7aaf 100644 --- a/lib/release/leave.rb +++ b/lib/release/leave.rb @@ -4,14 +4,24 @@ module Release class Leave < Release::Base def valid? - argv.size == 1 + argv.size == 2 end def help - "release leave" + "release leave local-branch-confirmation" end def execute + if argv.size == 2 + confirmation_branch = argv[1] + else + confirmation_branch = '' + end + + release_branch = current_branch + + error "Missing confirmation of branch: #{release_branch}" if confirmation_branch == '' + error "Confirmation branch does not match current branch: #{confirmation_branch} vs #{release_branch}" if release_branch != confirmation_branch validate_current_branch_is_release git_checkout 'master'