Skip to content

[Github] Use three dot diff for darker in code format action #74704

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

Merged
merged 1 commit into from
Dec 7, 2023

Conversation

boomanaiden154
Copy link
Contributor

Using a two dot diff allows changes made in main after the merge base to show up in the formatting diff. Using a three dot diff fixes this and ensures that only changes made in the source branch (branch from the PR author) will get passed along to the formatter.

Without this, issues like #73873 occur.

Using a two dot diff allows changes made in main after the merge base to
show up in the formatting diff. Using a three dot diff fixes this and
ensures that only changes made in the source branch (branch from the PR
author) will get passed along to the formatter.
Copy link
Collaborator

@tru tru left a comment

Choose a reason for hiding this comment

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

Ugh, the three dot vs two dots always confuses me and I never remember which is which. Thanks for fixing that.

@boomanaiden154
Copy link
Contributor Author

Ugh, the three dot vs two dots always confuses me and I never remember which is which. Thanks for fixing that.

I will promptly forget all the details in a couple days once this is all fixed up. 😆

Still need to get this fixed on the clang-format side, but that will require a nightly git-clang-format right now as the patch enabling three dot diffs there just landed.

@boomanaiden154 boomanaiden154 merged commit 2b1c76c into llvm:main Dec 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants