diff options
| author | bors <bors@rust-lang.org> | 2022-08-03 06:49:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-03 06:49:13 +0000 |
| commit | a02b042ae75c368e4eaceb899ac3f4bcc97191ca (patch) | |
| tree | 4b899363de73a15d2bdd7e5554902ecff02cc017 | |
| parent | 1c03f45c08145be5b1ecd40aa1f28a12c615d63a (diff) | |
| parent | 9a447c04f6c07ec6b835b3577610cfaf3f7667cc (diff) | |
| download | rust-a02b042ae75c368e4eaceb899ac3f4bcc97191ca.tar.gz rust-a02b042ae75c368e4eaceb899ac3f4bcc97191ca.zip | |
Auto merge of #12930 - lnicola:subtree-branch, r=lnicola
minor: Use the release branch in xtask promote
| -rw-r--r-- | xtask/src/release.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xtask/src/release.rs b/xtask/src/release.rs index 17ada515640..eda8fceef05 100644 --- a/xtask/src/release.rs +++ b/xtask/src/release.rs @@ -81,7 +81,7 @@ impl flags::Promote { 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()?; |
