Auto merge of #12930 - lnicola:subtree-branch, r=lnicola

minor: Use the release branch in xtask promote
This commit is contained in:
bors
2022-08-03 06:49:13 +00:00
+1 -1
View File
@@ -81,7 +81,7 @@ pub(crate) fn run(self, sh: &Shell) -> anyhow::Result<()> {
let date = date_iso(sh)?;
let branch = format!("rust-analyzer-{date}");
cmd!(sh, "git switch -c {branch}").run()?;
cmd!(sh, "git subtree pull -P src/tools/rust-analyzer rust-analyzer master").run()?;
cmd!(sh, "git subtree pull -m ':arrow_up: rust-analyzer' -P src/tools/rust-analyzer rust-analyzer release").run()?;
if !self.dry_run {
cmd!(sh, "git push -u origin {branch}").run()?;