eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-11 13:23:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

clang-format: add 'RemoveBracesLLVM' to the main config

Browse Source 
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>
This commit is contained in:
Karthik Nayak 2025-07-02 11:23:19 +02:00 committed by Junio C Hamano
parent 9e45fc6ce5
commit 73d8380e56
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.clang-format
View File

@ -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

18
ci/run-style-check.sh
View File

@ -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"