Add rustfmt 2024 reformatting to git blame ignore #130736
Merged
Conversation
This file contains hidden or 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
rustbot
added
A-meta
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
|
I should add some docs in the dev-guide about when and how to add entries to |
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Sep 23, 2024
…ompiler-errors Add rustfmt 2024 reformatting to git blame ignore rust-lang#130724 essentially reformatted the world, so we should add it to the git blame ignore list. Tested with `git blame compiler/rustc_abi/src/lib.rs -L1137,1146`. I first thought that I have to ignore the merge commit, but it seems like the actual commit that did the reformatting should be ignored instead. r? `@compiler-errors`
This was referenced Sep 23, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 23, 2024
…kingjubilee Rollup of 7 pull requests Successful merges: - rust-lang#129201 (std: implement the `random` feature (alternative version)) - rust-lang#130536 (bootstrap: Set the dylib path when building books with rustdoc) - rust-lang#130551 (Fix `break_last_token`.) - rust-lang#130657 (Remove x86_64-fuchsia and aarch64-fuchsia target aliases) - rust-lang#130721 (Add more test cases for block-no-opening-brace) - rust-lang#130736 (Add rustfmt 2024 reformatting to git blame ignore) - rust-lang#130746 (readd `@tgross35` and `@joboet` to the review rotation) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 23, 2024
Rollup merge of rust-lang#130736 - Kobzol:rustfmt-2024-git-blame, r=compiler-errors Add rustfmt 2024 reformatting to git blame ignore rust-lang#130724 essentially reformatted the world, so we should add it to the git blame ignore list. Tested with `git blame compiler/rustc_abi/src/lib.rs -L1137,1146`. I first thought that I have to ignore the merge commit, but it seems like the actual commit that did the reformatting should be ignored instead. r? ``@compiler-errors``
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
#130724 essentially reformatted the world, so we should add it to the git blame ignore list.
Tested with
git blame compiler/rustc_abi/src/lib.rs -L1137,1146. I first thought that I have to ignore the merge commit, but it seems like the actual commit that did the reformatting should be ignored instead.r? @compiler-errors