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

Add a .git-blame-ignore-revs #2433

Closed
wants to merge 3 commits into from

Conversation

helen
Copy link
Member

@helen helen commented Mar 18, 2022

This adds a .git-blame-ignore-revs file to exclude certain commits from visual blame on GitHub.com, which can also be used on the command line via git blame --ignore-revs-file .git-blame-ignore-revs.

This is not a complete list of commits, though it does include all the commits I found for "pinking shears" with the exception of one that I noticed contained other changes. I would really love some help double checking these commits to make sure we're not including any that are anything besides whitespace/style fixes; it's better to be conservative to start. Would also like feedback / suggestions on the format of the file, particularly around the comments and how we label things to be able to maintain this file now and into the future.

Trac ticket: https://core.trac.wordpress.org/ticket/55422


This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.

@costdev
Copy link
Contributor

costdev commented Mar 18, 2022

Some "Code is Poetry" commits (case insensitive search):

e4e1a54567dca12048e5344ab5b60a85e0d96743 # [4375]
e37aff4320b89bd94e21517f65d298f9f1fe6b37 # [45559]

and you already have this one under # PHPCS:

8f95800d52c1736d651ae6e259f90ad4a0db2c3f # [42343]
@helen
Copy link
Member Author

helen commented Mar 18, 2022

@costdev I personally see those two commits as more than purely stylistic; I don't believe anything would have been affected by those specifically but sometimes subtle things like that (especially that final falsey check) can cause side effects and I would want to see those in the history. Definitely open to the idea that being more liberal about leaving commits out of our default code archaeology is a good idea, but I think I'd need a lot of convincing :)

Copy link
Contributor

@peterwilsoncc peterwilsoncc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

Commits reviewed with whitespace suppressed, I've noted pinking shears commits with more than white space changes.

The final commit I've not reviewed in full as it was a phpcbf run and Stephen and I were staring checked Gary's work at the time.

.git-blame-ignore-revs Show resolved Hide resolved
.git-blame-ignore-revs Outdated Show resolved Hide resolved
.git-blame-ignore-revs Show resolved Hide resolved
.git-blame-ignore-revs Outdated Show resolved Hide resolved
@peterwilsoncc
Copy link
Contributor

I personally see those two commits as more than purely stylistic; I don't believe anything would have been affected by those specifically but sometimes subtle things like that (especially that final falsey check)

Yeah, e37aff4 broke something and was caught in the following commit. My code was not poetry.

Co-authored-by: Peter Wilson <519727+peterwilsoncc@users.noreply.github.com>
@helen
Copy link
Member Author

helen commented Mar 28, 2022

I personally see those two commits as more than purely stylistic; I don't believe anything would have been affected by those specifically but sometimes subtle things like that (especially that final falsey check)

Yeah, e37aff4 broke something and was caught in the following commit. My code was not poetry.

@peterwilsoncc I feel both disappointed in myself that I didn't actually check on follow up commits and weirdly gratified that my worst instincts remain correct 😆

@helen
Copy link
Member Author

helen commented Mar 29, 2022

Committed in 921d280

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants