diff options
| author | Karthik Nayak <karthik.188@gmail.com> | 2025-07-02 11:23:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-02 09:05:29 -0700 |
| commit | 73d8380e56087ac0a4285596e74444e26d01fb89 (patch) | |
| tree | 6c9ff24a99637f696959d1196e54119ad79de772 | |
| parent | clang-format: set 'ColumnLimit' to 0 (diff) | |
| download | git-73d8380e56087ac0a4285596e74444e26d01fb89.tar.gz git-73d8380e56087ac0a4285596e74444e26d01fb89.zip | |
clang-format: add 'RemoveBracesLLVM' to the main config
In 1b8f306612 (ci/style-check: add `RemoveBracesLLVM` in CI job,
2024-07-23) we added 'RemoveBracesLLVM' to the CI job of running the
clang formatter.
This rule checks and warns against using braces on simple
single-statement bodies of statements. Since we haven't had any issues
regarding this rule, we can now move it into the main clang-format
config and remove it from being CI exclusive.
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | .clang-format | 6 | ||||
| -rwxr-xr-x | ci/run-style-check.sh | 18 |
2 files changed, 7 insertions, 17 deletions
diff --git a/.clang-format b/.clang-format index 19d6cf4200..dcfd0aad60 100644 --- a/.clang-format +++ b/.clang-format @@ -220,3 +220,9 @@ KeepEmptyLinesAtTheStartOfBlocks: false # Don't sort #include's SortIncludes: false + +# Remove optional braces of control statements (if, else, for, and while) +# according to the LLVM coding style. This avoids braces on simple +# single-statement bodies of statements but keeps braces if one side of +# if/else if/.../else cascade has multi-statement body. +RemoveBracesLLVM: true diff --git a/ci/run-style-check.sh b/ci/run-style-check.sh index 6cd4b1d934..0832c19df0 100755 --- a/ci/run-style-check.sh +++ b/ci/run-style-check.sh @@ -5,21 +5,5 @@ baseCommit=$1 -# Remove optional braces of control statements (if, else, for, and while) -# according to the LLVM coding style. This avoids braces on simple -# single-statement bodies of statements but keeps braces if one side of -# if/else if/.../else cascade has multi-statement body. -# -# As this rule comes with a warning [1], we want to experiment with it -# before adding it in-tree. since the CI job for the style check is allowed -# to fail, appending the rule here allows us to validate its efficacy. -# While also ensuring that end-users are not affected directly. -# -# [1]: https://clang.llvm.org/docs/ClangFormatStyleOptions.html#removebracesllvm -{ - cat .clang-format - echo "RemoveBracesLLVM: true" -} >/tmp/clang-format-rules - -git clang-format --style=file:/tmp/clang-format-rules \ +git clang-format --style=file:.clang-format \ --diff --extensions c,h "$baseCommit" |