summaryrefslogtreecommitdiff
path: root/task/release.rake
diff options
context:
space:
mode:
Diffstat (limited to 'task/release.rake')
-rw-r--r--task/release.rake3
1 files changed, 2 insertions, 1 deletions
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