12-package.json: update when release candidate created

2017-10-10 20:23:06 -04:00
parent f753b647d3
commit b09accebd0
6 changed files with 15 additions and 15 deletions
--- a/lib/release/trash.rb
+++ b/lib/release/trash.rb
@@ -24,8 +24,8 @@ module Release
      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'
-      git_fetch_and_merge current_branch
+      git_checkout :master
+      git_fetch_and_merge :master

      git_local_branch_trash release_branch