diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-09 14:58:14 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-02-09 14:58:14 +0000 |
commit | 4ae7d39f77995ad455c7a21c7fdfc1deb588e782 (patch) | |
tree | 1782dc18b522aa3ac632d2e2787d0fd28e976e9a /xtask | |
parent | fca93cfed339de88e1807e0633d24a2b3a7f01d5 (diff) | |
parent | c0ff61c4b9290fdb810bd37ec77c43ee66256691 (diff) |
Merge #7597
7597: Set remote branch on xtask promote r=matklad a=lnicola
to hopefully fix this:
```
$ git switch master
Already on 'master'
Your branch is up to date with 'upstream/master'.
$ git fetch upstream
$ git reset --hard upstream/master
HEAD is now at 921ec4b3fca Auto merge of #81313 - LeSeulArtichaut:revert-32558, r=jyn514
$ git submodule update --recursive
Submodule path 'src/tools/rust-analyzer': checked out '1a59f75cdaa730c16a694a4294eccf6dfe6fe0ad'
$ git switch -c rust-analyzer-2021-02-08
Switched to a new branch 'rust-analyzer-2021-02-08'
$ git fetch origin
$ git reset --hard origin/release
HEAD is now at 336909b63 Merge #7587
$ git add src/tools/rust-analyzer
$ git commit "-m:arrow_up: rust-analyzer"
[rust-analyzer-2021-02-08 1774ec1a683] :arrow_up: rust-analyzer
1 file changed, 1 insertion(+), 1 deletion(-)
$ git push
fatal: The current branch rust-analyzer-2021-02-08 has no upstream branch.
To push the current branch and set the remote as upstream, use
git push --set-upstream origin rust-analyzer-2021-02-08
Error: command `git push` failed, exit code: 128
```
Co-authored-by: Laurențiu Nicola <[email protected]>
Diffstat (limited to 'xtask')
-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 2d716253e..93079b369 100644 --- a/xtask/src/release.rs +++ b/xtask/src/release.rs | |||
@@ -99,7 +99,7 @@ impl PromoteCmd { | |||
99 | cmd!("git add src/tools/rust-analyzer").run()?; | 99 | cmd!("git add src/tools/rust-analyzer").run()?; |
100 | cmd!("git commit -m':arrow_up: rust-analyzer'").run()?; | 100 | cmd!("git commit -m':arrow_up: rust-analyzer'").run()?; |
101 | if !self.dry_run { | 101 | if !self.dry_run { |
102 | cmd!("git push").run()?; | 102 | cmd!("git push -u").run()?; |
103 | cmd!("xdg-open https://github.com/matklad/rust/pull/new/{branch}?body=r%3F%20%40ghost") | 103 | cmd!("xdg-open https://github.com/matklad/rust/pull/new/{branch}?body=r%3F%20%40ghost") |
104 | .run()?; | 104 | .run()?; |
105 | } | 105 | } |