aboutsummaryrefslogtreecommitdiff
path: root/crates/proc_macro_srv/src/proc_macro
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-02-09 14:58:14 +0000
committerGitHub <[email protected]>2021-02-09 14:58:14 +0000
commit4ae7d39f77995ad455c7a21c7fdfc1deb588e782 (patch)
tree1782dc18b522aa3ac632d2e2787d0fd28e976e9a /crates/proc_macro_srv/src/proc_macro
parentfca93cfed339de88e1807e0633d24a2b3a7f01d5 (diff)
parentc0ff61c4b9290fdb810bd37ec77c43ee66256691 (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 'crates/proc_macro_srv/src/proc_macro')
0 files changed, 0 insertions, 0 deletions