diff options
author | Benjamin Coenen <[email protected]> | 2020-04-07 16:59:09 +0100 |
---|---|---|
committer | Benjamin Coenen <[email protected]> | 2020-04-07 16:59:09 +0100 |
commit | 18a5e164838e1dc2abcc6b79d4fc2f96ffd2507c (patch) | |
tree | bc80b5c49c3b7ba31c7fe967bb34fe14bac9d5ed /xtask/src/lib.rs | |
parent | ab864ed259c10ff51f7c9c3421d098eeea7b0245 (diff) | |
parent | 33c364b545350134b945fbca834194fd1a28fe08 (diff) |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer
Diffstat (limited to 'xtask/src/lib.rs')
-rw-r--r-- | xtask/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs index 4f01f84fb..0b8243f62 100644 --- a/xtask/src/lib.rs +++ b/xtask/src/lib.rs | |||
@@ -172,8 +172,8 @@ pub fn run_pre_cache() -> Result<()> { | |||
172 | pub fn run_release(dry_run: bool) -> Result<()> { | 172 | pub fn run_release(dry_run: bool) -> Result<()> { |
173 | if !dry_run { | 173 | if !dry_run { |
174 | run!("git switch release")?; | 174 | run!("git switch release")?; |
175 | run!("git fetch upstream")?; | 175 | run!("git fetch upstream --tags --force")?; |
176 | run!("git reset --hard upstream/master")?; | 176 | run!("git reset --hard tags/nightly")?; |
177 | run!("git push")?; | 177 | run!("git push")?; |
178 | } | 178 | } |
179 | 179 | ||