Dont use --merge-base during bootstrap formatting subcommand
#106310
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @jyn514 (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
T-bootstrap
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
jyn514
added a commit
to jyn514/rust
that referenced
this pull request
Dec 31, 2022
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 rust-lang#105702 because it uses the `--merge-base` option on `diff-index`, which was only introduced in git 2.30 (git/git@0f5a1d4). Luckily, it can be replicated via two calls to `git merge-base` + `git diff-index`, so let's just use that.
jyn514
added a commit
to jyn514/rust
that referenced
this pull request
Dec 31, 2022
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 rust-lang#105702 because it uses the `--merge-base` option on `diff-index`, which was only introduced in git 2.30 (git/git@0f5a1d4). Luckily, it can be replicated via two calls to `git merge-base` + `git diff-index`, so let's just use that.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 31, 2022
…mpiler-errors Rollup of 9 pull requests Successful merges: - rust-lang#105903 (Unify id-based thread parking implementations) - rust-lang#106232 (CFI: Monomorphize transparent ADTs before typeid) - rust-lang#106248 (Revert "Implement allow-by-default `multiple_supertrait_upcastable` lint") - rust-lang#106286 (Make tidy errors red) - rust-lang#106295 (Extend scraped examples layout GUI test for position of buttons) - rust-lang#106305 ( bootstrap: Get rid of tail_args in stream_cargo) - rust-lang#106310 (Dont use `--merge-base` during bootstrap formatting subcommand) - rust-lang#106314 (Fix panic on `x build --help`) - rust-lang#106317 (Only deduplicate stack traces for good path bugs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I use a development image with Ubuntu 20.04 LTS, which has git 2.25.
Recently,
./x.py test tidy --blessregressed in #105702 because it uses the--merge-baseoption ondiff-index, which was only introduced in git 2.30 (git/git@0f5a1d4). Luckily, it can be replicated via two calls togit merge-base+git diff-index, so let's just use that.