summaryrefslogtreecommitdiff
path: root/task
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-11-07 16:27:46 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-11-07 16:39:32 +0100
commitbc3e0cc537d5a7964a7025bb80b2676b4e7fe234 (patch)
tree21a06da0e8b8cd74cc33a18484938a9b8f012c89 /task
parenta1ecdbffceded635d615fc31d4823a2a67a8db0d (diff)
downloadbundler-bc3e0cc537d5a7964a7025bb80b2676b4e7fe234.tar.gz
Show proper error message when opening shell failed
Diffstat (limited to 'task')
-rw-r--r--task/release.rake5
1 files changed, 4 insertions, 1 deletions
diff --git a/task/release.rake b/task/release.rake
index cd66ff755d..3a14243263 100644
--- a/task/release.rake
+++ b/task/release.rake
@@ -182,7 +182,10 @@ namespace :release do
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")
+
+ unless system("zsh")
+ abort "Failed to resolve conflicts on a different shell. Resolve conflicts manually and finish the task manually"
+ end
end
version_file = "lib/bundler/version.rb"