godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Style: Mark clang-format 16 as supported for pre-commit hook 

It only introduced a difference in a .glsl file, which I've worked
around by removing an empty line. This keeps formatting consistent
between clang-format 15 and 16.

Also added a change in the 3-to-4 project converter to fix bogus
formatting in clang-format < 17.

(cherry picked from commit 49f4860ce3)
This commit is contained in:
Rémi Verschelde 2023-12-06 13:12:18 +01:00
parent ebd65eeb23
commit 561a6cd503
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/hooks/README.md
View File

@ -29,7 +29,7 @@ so they should work out of the box on Linux/macOS.
##### clang-format ##### clang-format
- Download LLVM for Windows (version 13 or later) from - Download LLVM for Windows (version 13 or later) from
<https://releases.llvm.org/download.html> <https://github.com/llvm/llvm-project/releases>
- Make sure LLVM is added to the `PATH` during installation - Make sure LLVM is added to the `PATH` during installation
##### black ##### black

2
misc/hooks/pre-commit-clang-format
View File

@ -77,7 +77,7 @@ fi
# To get consistent formatting, we recommend contributors to use the same # To get consistent formatting, we recommend contributors to use the same
# clang-format version as CI. # clang-format version as CI.
RECOMMENDED_CLANG_FORMAT_MAJOR_MIN="13" RECOMMENDED_CLANG_FORMAT_MAJOR_MIN="13"
RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="15" RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="16"
if [ ! -x "$CLANG_FORMAT" ] ; then if [ ! -x "$CLANG_FORMAT" ] ; then
message="Error: clang-format executable not found. Please install clang-format $RECOMMENDED_CLANG_FORMAT_MAJOR_MAX." message="Error: clang-format executable not found. Please install clang-format $RECOMMENDED_CLANG_FORMAT_MAJOR_MAX."