diff options
| author | Michael Goulet <michael@errs.io> | 2022-12-30 21:26:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-30 21:26:36 -0800 |
| commit | 96e32a49c9bdba7dae3e891e16d663f3745f30de (patch) | |
| tree | 0eb35b1a5b56bc6363f45263f49a3df7717cc1fc /tests/rustdoc-js-std/parser-errors.js | |
| parent | 93032e8112066612263eddf45d58c0438f3f5a54 (diff) | |
| parent | e2c5999265916399b0700b513cda0221fc8f7ad3 (diff) | |
| download | rust-96e32a49c9bdba7dae3e891e16d663f3745f30de.tar.gz | |
Rollup merge of #106310 - compiler-errors:old-git, r=jyn514
Dont use `--merge-base` during bootstrap formatting subcommand
I use a development image with Ubuntu 20.04 LTS, which has git 2.25.
Recently, `./x.py test tidy --bless` regressed in #105702 because it uses the `--merge-base` option on `diff-index`, which was only introduced in git 2.30 (git/git@0f5a1d449b9538c2765de9d6683abbb83a7fb4e2). Luckily, it can be replicated via two calls to `git merge-base` + `git diff-index`, so let's just use that.
Diffstat (limited to 'tests/rustdoc-js-std/parser-errors.js')
0 files changed, 0 insertions, 0 deletions