Skip to content

ci(security-guardian): use triple dot to get PR diff changes #36588

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.

Sign up for GitHub

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

Jump to bottom
Merged
mergify merged 5 commits into from
Jan 20, 2026
Merged

ci(security-guardian): use triple dot to get PR diff changes #36588

mergify merged 5 commits into from
Jan 20, 2026

Conversation

@Abogical
Copy link
Member

@Abogical Abogical commented Jan 6, 2026 •
edited by kumvprat
Loading

Reason for this change

It was incorrectly assumed that git diff A..B would behave similarly to git log A..B, but that is not the case. Counterintuitively, it behaves like git log A...B, getting changes from the main branch as well, which is not what we want.

See https://stackoverflow.com/questions/7251477/what-are-the-differences-between-double-dot-and-triple-dot-in-git-dif/46345364#46345364

Description of changes

The correct command is git diff A...B. This behaves like git log A..B as expected.

Describe any new or updated permissions being added

No new permissions are added.

Description of how you validated changes

Ran security guardian build and tests to verify

Checklist

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

@Abogical
Use triple dot to get PR diff changes
0b27e59 
It was incorrectly assumed that `git diff A..B` would behave similarly to `git log A..B`, but that is not the case. Counterintuitively, it behaves like `git log A...B`, getting changes from the main branch as well, which is not what we want.

The correct command is `git diff A...B`. This behaves like `git log A..B` as expected.

See https://stackoverflow.com/questions/7251477/what-are-the-differences-between-double-dot-and-triple-dot-in-git-dif/46345364#46345364
@aws-cdk-automation aws-cdk-automation requested a review from a team January 6, 2026 10:47
@github-actions github-actions bot added p2 star-contributor [Pilot] contributed between 25-49 PRs to the CDK labels Jan 6, 2026
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Jan 6, 2026
aws-cdk-automation
aws-cdk-automation previously requested changes Jan 6, 2026
View reviewed changes
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment •
edited
Loading

Choose a reason for hiding this comment

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

(This review is outdated)

@Abogical Abogical changed the title Use triple dot to get PR diff changes ci(security-guardian): use triple dot to get PR diff changes Jan 6, 2026
@aws-cdk-automation aws-cdk-automation dismissed their stale review January 6, 2026 10:54

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

@aws-cdk-automation aws-cdk-automation added the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Jan 6, 2026
@mergify
Copy link
Contributor

mergify bot commented Jan 20, 2026

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Jan 20, 2026
@mergify
Copy link
Contributor

mergify bot commented Jan 20, 2026

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@Abogical
Copy link
Member Author

Abogical commented Jan 20, 2026

@Mergifyio update

@mergify
Copy link
Contributor

mergify bot commented Jan 20, 2026

update

✅ Branch has been successfully updated

@mergify
Copy link
Contributor

mergify bot commented Jan 20, 2026 •
edited
Loading

Merge Queue Status

🚫 The pull request has left the queue (rule: default-squash) at 1dbf046

This pull request spent 42 seconds in the queue, with no time running CI.

Reason

The pull request #36588 has been manually updated

Hint

If you want to requeue this pull request, you can post a @mergifyio requeue comment.

@mergify
Copy link
Contributor

mergify bot commented Jan 20, 2026

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify
Copy link
Contributor

mergify bot commented Jan 20, 2026 •
edited
Loading

Merge Queue Status

✅ The pull request has been merged at 70f8f3c

This pull request spent 32 minutes 33 seconds in the queue, including 31 minutes 39 seconds running CI.
The checks were run in-place.

Required conditions to merge

@mergify
Copy link
Contributor

mergify bot commented Jan 20, 2026

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit 2f0a0c2 into main Jan 20, 2026
17 of 18 checks passed
@mergify mergify bot deleted the sec-guardian-triple-dot branch January 20, 2026 15:51
@github-actions
Copy link
Contributor

github-actions bot commented Jan 20, 2026

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 20, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@kumvprat kumvprat kumvprat approved these changes

@aws-cdk-automation aws-cdk-automation aws-cdk-automation left review comments

Assignees

No one assigned

Labels

contribution/core This is a PR that came from AWS. p2 star-contributor [Pilot] contributed between 25-49 PRs to the CDK

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Abogical @aws-cdk-automation @kumvprat