summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-09-10 09:40:20 +0200
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-09-10 09:53:20 +0200
commit180f36b9d5fc90b9d05298ec69e6db01a5ca9b6d (patch)
tree981f3530ac822526d3bf794391a3c9f2322e4a00
parent2075611b73d594a5c282d5a911c1432e432c0a21 (diff)
downloadbundler-180f36b9d5fc90b9d05298ec69e6db01a5ca9b6d.tar.gz
Cherry-pick commits into a new branch
So we can create a release PR to the stable branch.
-rw-r--r--task/release.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/task/release.rake b/task/release.rake
index 9c1f7f852c..a2de199c84 100644
--- a/task/release.rake
+++ b/task/release.rake
@@ -162,7 +162,7 @@ namespace :release do
prs.compact!
branch = version.split(".", 3)[0, 2].push("stable").join("-")
- sh("git", "checkout", branch)
+ sh("git", "checkout", "-b", "release/#{version}", branch)
commits = `git log --oneline origin/master --`.split("\n").map {|l| l.split(/\s/, 2) }.reverse
commits.select! {|_sha, message| message =~ /(Auto merge of|Merge pull request|Merge) ##{Regexp.union(*prs)}/ }