Skip to content

chore(repo): point .git-blame-ignore-revs at the #302 squash commit - #325

Merged
aghassemlouei merged 1 commit into
google:mainfrom
digitalresistor:chore/blame-ignore-squash-commit
Oct 21, 2026
Merged

aghassemlouei merged 1 commit into
google:mainfrom
digitalresistor:chore/blame-ignore-squash-commit

Conversation

@digitalresistor

@digitalresistor digitalresistor commented Oct 21, 2026 •

Copy link
Copy Markdown
Contributor

Description

This change makes git blame and the GitHub blame view skip the ruff reformat from #302 again.

No issue exists for this change.

Merge order

These four pull requests share one merge order. Merge them in this sequence.

  1. style(tests): format test_label_taxonomy.py with ruff #324 makes the ruff check step pass on main again. Every other pull request needs it for a green CI run.
  2. build(tools): run the repository tooling on a locked uv Python 3.14 environment #323 adds the root uv.lock file. Rebase it onto main after 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.
  3. ci(deps): open Dependabot pull requests for pinned versions #326 adds Dependabot. Its root uv entry needs the uv.lock file from build(tools): run the repository tooling on a locked uv Python 3.14 environment #323.
  4. chore(repo): point .git-blame-ignore-revs at the #302 squash commit #325 fixes .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

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

Deployment & Compliance Impact

  • Applicable Regimes:
    • US Region Restricted (e.g., Access Policy constraint)
    • FedRAMP Moderate
    • FedRAMP High
    • DoD IL4
    • DoD IL5
    • General / All
  • NIST 800-53r5 Controls: None. The change affects repository metadata only and deploys no resources.

Checklist

Code Quality & Reusability

  • My code adheres to the Maximize Reusability principle. I have not redefined common elements and have reused existing base configurations and modules where possible.
  • I have checked that no existing module or configuration in modules/ or fast/stages-aw/ can be leveraged for this change.
  • My code follows the established naming conventions outlined in docs/naming-convention.md.

Documentation

  • I have updated the README.md of the modified module or blueprint.
  • I have added/updated documentation for inputs (variables) and outputs.

Security

  • My change adheres to GCP security best practices and the principle of least privilege.
  • I have ensured compliance with the targeted regime (FedRAMP Moderate, FedRAMP High, IL4, IL5, etc.).

Testing

  • I have tested my changes locally.
  • I have included details of my testing in this PR.

Testing Performed

…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.

@aghassemlouei aghassemlouei left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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.

@aghassemlouei
aghassemlouei merged commit faa743d into google:main Oct 21, 2026
19 of 21 checks passed
@aghassemlouei aghassemlouei mentioned this pull request Oct 22, 2026
@aghassemlouei aghassemlouei added Enhancement New feature or request Level of Effort - Low Quick, well-defined tasks with no unknowns; takes a few hours up to one day to complete Priority - Low Minor polish, typo fixes, or technical debt; nice to have; pick up when time permits labels Oct 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Enhancement New feature or request Level of Effort - Low Quick, well-defined tasks with no unknowns; takes a few hours up to one day to complete Priority - Low Minor polish, typo fixes, or technical debt; nice to have; pick up when time permits

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants