summaryrefslogtreecommitdiffstats
path: root/misc/hooks/pre-commit-clang-format
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-12-06 13:12:18 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-12-06 13:26:53 +0100
commit49f4860ce3e4122e17c869229701f7d86aa6956c (patch)
tree27c9dc9a7f00663854def367f6d085604ff98e20 /misc/hooks/pre-commit-clang-format
parent2f73a059cefadcd944b6874f2557ec82e46a562d (diff)
downloadredot-engine-49f4860ce3e4122e17c869229701f7d86aa6956c.tar.gz
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.
Diffstat (limited to 'misc/hooks/pre-commit-clang-format')
-rwxr-xr-xmisc/hooks/pre-commit-clang-format2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format
index fd0213c175..e5cf0c4aa2 100755
--- a/misc/hooks/pre-commit-clang-format
+++ b/misc/hooks/pre-commit-clang-format
@@ -80,7 +80,7 @@ fi
# To get consistent formatting, we recommend contributors to use the same
# clang-format version as CI.
RECOMMENDED_CLANG_FORMAT_MAJOR_MIN="13"
-RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="15"
+RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="16"
if [ ! -x "$CLANG_FORMAT" ] ; then
message="Error: clang-format executable not found. Please install clang-format $RECOMMENDED_CLANG_FORMAT_MAJOR_MAX."