diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-05-19 15:52:29 +0000 |
|---|---|---|
| committer | The Bundler Bot <bot@bundler.io> | 2017-05-19 15:52:29 +0000 |
| commit | 13c693f82bb2ba61132caa23eafee8907072450e (patch) | |
| tree | 450b5cf28b14400e26b01baaa2dcbb3f227157fd | |
| parent | 024c7e380e62e95e5dd3eac39390e69e340e688d (diff) | |
| parent | 754d9264079db7898b3dd997cb00fd6ac5a34d14 (diff) | |
| download | bundler-13c693f82bb2ba61132caa23eafee8907072450e.tar.gz | |
Auto merge of #5671 - bundler:seg-release-no-changes, r=segiddins
[Rakefile] Allow making a patch release with no changes
i.e. going from a pre to a .0
| -rw-r--r-- | task/release.rake | 3 |
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 |