From 180f36b9d5fc90b9d05298ec69e6db01a5ca9b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Tue, 10 Sep 2019 09:40:20 +0200 Subject: Cherry-pick commits into a new branch So we can create a release PR to the stable branch. --- task/release.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)}/ } -- cgit v1.2.1