Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore "format the world" commit in git blame #95342

Merged
merged 1 commit into from
Apr 6, 2022

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Mar 26, 2022

This tells github to hide it in its blame view: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
It can also be used locally by running git config blame.ignorerevsfile .git-blame-ignore-revs (although it's advised to avoid --global since git gives a hard error when the file doesn't exist).

We may want to add more commits in later PRs, but this should be a good start.

Before: image
After: image
cc https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/Hide.20some.20commits.20in.20GitHub.20blame

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 26, 2022
@est31
Copy link
Member

est31 commented Mar 26, 2022

Also 971c549 , which I discovered when trying to find out what introduced this monstrosity.

This tells github to hide it in its blame view: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
It can also be used locally by running `git config blame.ignorerevsfile .git-blame-ignore-revs` (although it's advised to avoid `--global` since git gives a hard error when the file doesn't exist).

We may want to add more commits in later PRs, but this should be a good start.
@Mark-Simulacrum
Copy link
Member

This seems great. I'm a little worried it hurts those trying to add this file themselves locally, but I think they should be able to just upstream that fairly easily in most cases, so should be OK.

@bors r+

@bors
Copy link
Contributor

bors commented Apr 6, 2022

📌 Commit 7a9549a has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 6, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 6, 2022
Ignore "format the world" commit in git blame

This tells github to hide it in its blame view: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
It can also be used locally by running `git config blame.ignorerevsfile .git-blame-ignore-revs` (although it's advised to avoid `--global` since git gives a hard error when the file doesn't exist).

We may want to add more commits in later PRs, but this should be a good start.

Before: ![image](https://user-images.githubusercontent.com/23638587/160255130-d7283cc4-4d33-4a7d-bc70-f9ce6820293c.png)
After: ![image](https://user-images.githubusercontent.com/23638587/160255138-90d0325a-e063-4e0e-8cfb-732724bf6c60.png)
cc https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/Hide.20some.20commits.20in.20GitHub.20blame
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 6, 2022
Rollup of 6 pull requests

Successful merges:

 - rust-lang#95342 (Ignore "format the world" commit in git blame)
 - rust-lang#95353 ([bootstrap] Give a hard error when filtering tests for a file that does not exist)
 - rust-lang#95649 (New mir-opt deref_separator)
 - rust-lang#95721 (Fix typo in bootstrap/setup.rs)
 - rust-lang#95730 (Rename RWLock to RwLock in std::sys.)
 - rust-lang#95731 (Check that all hidden types are the same and then deduplicate them.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 86ddbf2 into rust-lang:master Apr 6, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 6, 2022
@jyn514 jyn514 deleted the ignore-revs branch February 25, 2023 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants