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

chore: update git blame ignore commit ID #5164

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

johubertj
Copy link
Contributor

@johubertj johubertj commented Mar 5, 2025

Description of changes:

Added the wrong commit ID in (#5151), should be commit id ac1d09851b4d625f83d1fa68b467abbca8fdd408 based on running git log after merging formatting changes

In #5138 because of a bad rebase, I added back a file (test_well_known_endpoints.py) that should have stayed removed.

Testing

After updating the commit ID, line 50 in test_happy_path.py initially shows Jacob Jo in git blame, but after closing and reopening the file, it correctly reverts to Sam Clark.

line 115-118 in common.py initially shows Jacob Jo in git blame, but after closing and reopening the file, it correctly reverts to Ryan Day.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@johubertj johubertj marked this pull request as ready for review March 5, 2025 22:04
@github-actions github-actions bot added the s2n-core team label Mar 5, 2025
@johubertj johubertj changed the title used the wrong commit id chore: git blame fix commit id Mar 5, 2025
@johubertj johubertj changed the title chore: git blame fix commit id chore: update git blame ignore commit ID Mar 5, 2025
Copy link
Contributor

@jmayclin jmayclin left a comment

Choose a reason for hiding this comment

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

Let's also fix the well_known_endpoints.py issue in this PR.

Edit: And can you just manually test that this affects the git blame as expected, and then fill out the PR testing section with the results of that?

@johubertj johubertj requested a review from jmayclin March 5, 2025 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants