diff options
| author | bors <bors@rust-lang.org> | 2023-01-06 21:51:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-06 21:51:44 +0000 |
| commit | 7ac9572c48435b5342ad3550d6036bde835d37dc (patch) | |
| tree | 5d084e243ed2d75bfb1249f60a339ac2597c8c0e /tests/rustdoc-js-std/parser-errors.js | |
| parent | 0fb8b72ce49997d60a631e921d2cf5be9ca229e6 (diff) | |
| parent | d5e5762211a6c8ee22b789c15596d2b49a45ed3f (diff) | |
| download | rust-7ac9572c48435b5342ad3550d6036bde835d37dc.tar.gz | |
Auto merge of #106415 - Nilstrieb:where-is-my-master-branch, r=jyn514
Handle non-existent upstream master branches in `x fmt`
People who do have a remote for `rust-lang/rust` but don't have the master branch checked out there used to get this error when running `x fmt`:
> fatal: ambiguous argument 'rust/master': unknown revision or path not in the working tree.
> Use '--' to separate paths from revisions, like this:
> 'git <command> [<revision>...] -- [<file>...]'
> rust/master
Which is not exactly helpful.
Now, we fall back to `origin/master` (hoping that at least that remote exists) for that case. If there is still some error, we just fall back to `x fmt .` and print a warning.
r? `@jyn514`
Diffstat (limited to 'tests/rustdoc-js-std/parser-errors.js')
0 files changed, 0 insertions, 0 deletions