summaryrefslogtreecommitdiff
path: root/task
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-05-19 08:40:35 -0700
committerSamuel Giddins <segiddins@segiddins.me>2017-05-19 08:43:13 -0700
commit754d9264079db7898b3dd997cb00fd6ac5a34d14 (patch)
tree377b0c2c8dbd14268c0fdc2436a212e7b039c093 /task
parent52e01785a50ceba97c7ea850e103a2647a0d4ff6 (diff)
downloadbundler-754d9264079db7898b3dd997cb00fd6ac5a34d14.tar.gz
[Rakefile] Allow making a patch release with no changesseg-release-no-changes
i.e. going from a pre to a .0
Diffstat (limited to 'task')
-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