Bladeren bron

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 49f4860ce3e4122e17c869229701f7d86aa6956c)
Rémi Verschelde 1 jaar geleden
bovenliggende
commit
561a6cd503
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      misc/hooks/README.md
  2. 1 1
      misc/hooks/pre-commit-clang-format

+ 1 - 1
misc/hooks/README.md

@@ -29,7 +29,7 @@ so they should work out of the box on Linux/macOS.
 
 ##### clang-format
 - 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
 
 ##### black

+ 1 - 1
misc/hooks/pre-commit-clang-format

@@ -77,7 +77,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."