From 754d9264079db7898b3dd997cb00fd6ac5a34d14 Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Fri, 19 May 2017 08:40:35 -0700 Subject: [Rakefile] Allow making a patch release with no changes i.e. going from a pre to a .0 --- task/release.rake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/task/release.rake b/task/release.rake index e030ef8293..104fe1f857 100644 --- a/task/release.rake +++ b/task/release.rake @@ -78,7 +78,8 @@ namespace :release do abort "Could not find commits for all PRs" unless commits.size == prs.size - unless system("git", "cherry-pick", "-x", "-m", "1", *commits.map(&:first)) + if commits.any? && !system("git", "cherry-pick", "-x", "-m", "1", *commits.map(&:first)) + warn "Opening a new shell to fix the cherry-pick errors" abort unless system("zsh") end -- cgit v1.2.1