Repository navigation
chore(repo): point .git-blame-ignore-revs at the #302 squash commit - #325
Merged
aghassemlouei merged 1 commit intoOct 21, 2026
Merged
Conversation
…mmit The file listed 1ce9889, the reformat commit on the google#302 branch. The squash merge left that commit off main, so git blame and GitHub skipped nothing. List the squash merge commit 7595e07 instead.
This was referenced Oct 21, 2026
aghassemlouei
approved these changes
Oct 21, 2026
aghassemlouei
left a comment
Member
There was a problem hiding this comment.
Verified that .git-blame-ignore-revs points to the #302 squash commit 7595e07901e790f0843dba97f73f05d77033d89e on main and that git blame with --ignore-revs-file=.git-blame-ignore-revs skips the #302 formatting changes as expected.
Merged
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
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.
Description
This change makes
git blameand the GitHub blame view skip the ruff reformat from #302 again.No issue exists for this change.
.git-blame-ignore-revsfile listed1ce9889a5, the reformat commit on the style(repo): replace yapf with ruff and adopt the Google Python Style Guide's 4-space indent #302 branch.main, so blame skipped nothing and attributed every reformatted line to style(repo): replace yapf with ruff and adopt the Google Python Style Guide's 4-space indent #302.7595e0790instead.tools/lint.sh, so blame skips those too. The file comment states this trade-off.Merge order
These four pull requests share one merge order. Merge them in this sequence.
ruff checkstep pass onmainagain. Every other pull request needs it for a green CI run.uv.lockfile. Rebase it ontomainafter style(tests): format test_label_taxonomy.py with ruff #324 merges, which drops its copy of the style(tests): format test_label_taxonomy.py with ruff #324 commit.uv.lockfile from build(tools): run the repository tooling on a locked uv Python 3.14 environment #323..git-blame-ignore-revs. It only needs style(tests): format test_label_taxonomy.py with ruff #324 for a green CI run, so it can merge at any point after style(tests): format test_label_taxonomy.py with ruff #324.This pull request is step 4.
Type of Change
Deployment & Compliance Impact
Checklist
Code Quality & Reusability
modules/orfast/stages-aw/can be leveraged for this change.docs/naming-convention.md.Documentation
README.mdof the modified module or blueprint.Security
Testing
Testing Performed
git merge-base --is-ancestor 1ce9889a5 origin/mainfails, which confirms that the old SHA is not onmain.git blame -s tools/check_names.pywithblame.ignoreRevsFileset attributes 4 lines to style(repo): replace yapf with ruff and adopt the Google Python Style Guide's 4-space indent #302, down from 70 with the old file. The remaining 4 lines are new lines that style(repo): replace yapf with ruff and adopt the Google Python Style Guide's 4-space indent #302 added.