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

Clang-format related changes #240

Merged
merged 4 commits into from
Jul 8, 2020
Merged

Conversation

uyjulian
Copy link
Member

@uyjulian uyjulian commented Jan 25, 2020

Pull Request checklist

Note: these are not necessarily requirements

  • I reformatted the code with clang-format
  • I checked to make sure my submission worked
  • I am the author of submission or have permission from the original author
  • Requires update of the PS2SDK
  • Requires update of the gsKit
  • Others (please specify below)

Pull Request description

Added sections to not run clang-format on.
Added a new Makefile rule to run clang-format.
Adds formatting check to continuous integration.
Run clang-format on files.

@ElPatas1
Copy link
Contributor

I can't merge this pull request, appears the message of:
"This branch has conflicts that must be resolved."

Best regards.

@uyjulian
Copy link
Member Author

uyjulian commented Jan 27, 2020 via email

@ElPatas1
Copy link
Contributor

I see, thank you.

Best regards.

@rickgaiser
Copy link
Member

I like the new "format" target you added, is makes it easy for everyone to use clang-format. But why has the coding standard changed? I can understand fine-tuning the previous coding standard, or re-running the standard on all files, but this change is larger than it needs to be.

  • We're already using spaces, why change it to tabs?
  • Why change bracket style to Allman?

Changing this many lines of code also has a negative effect on for instance git blame or git cherry-pick. Tools I use regulary to track bugs/changes and cherry-pick commits from different branches.

@uyjulian uyjulian changed the title [RFC] New clang format configuration Clang-format related changes Jul 6, 2020
@uyjulian
Copy link
Member Author

uyjulian commented Jul 6, 2020

I dropped the configuration changes and rebased.

@uyjulian uyjulian force-pushed the new_clang_format branch 3 times, most recently from 602f14b to ee1a828 Compare July 6, 2020 18:11
@uyjulian
Copy link
Member Author

uyjulian commented Jul 7, 2020

Probably #287 should be merged before this. I can rebase easily

@rickgaiser
Copy link
Member

The results of this PR look great. If you can rebase after #287 is merged I'll pull this PR.

@ElPatas1
Copy link
Contributor

ElPatas1 commented Jul 8, 2020

@uyjulian, then when #287 ir ready for merge, i merge it first and second is possible merge this pull request?
There is a conflict message now in this pull request:

"This branch has conflicts that must be resolved

Conflicting files

src/gui.c"

Best regards.

@uyjulian
Copy link
Member Author

uyjulian commented Jul 8, 2020

There will be a conflict when #287 is merged, so merge that first, I rebase this branch, then it is possible to merge this one.

@ElPatas1
Copy link
Contributor

ElPatas1 commented Jul 8, 2020

Hi, the PR of #287 has been merged.

Best regards.

@uyjulian uyjulian merged commit 7e4c753 into ps2homebrew:master Jul 8, 2020
AKuHAK pushed a commit that referenced this pull request Sep 30, 2021
citronalco pushed a commit to citronalco/OPL-Daily-Builds that referenced this pull request Sep 10, 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.

None yet

4 participants