Re-format with clang-format 16

[babeltrace.git] / tools / format-cpp.sh

diff --git a/tools/format-cpp.sh b/tools/format-cpp.sh
index 754b04d25ca68e71eb67db0737656353617f25da..763c726beee51418359143ef8dbbae152c655ac4 100755 (executable)
--- a/tools/format-cpp.sh
+++ b/tools/format-cpp.sh
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2020-2023 Philippe Proulx <pproulx@efficios.com>
 
-expected_formatter_major_version=15
+expected_formatter_major_version=16
 
 # Runs the formatter, returning 1 if it's not the expected version.
 #
@@ -44,8 +44,8 @@ format_cpp() {
        # We want an absolute starting directory because find(1) excludes
        # files in specific subdirectories.
        find "$(realpath "$root_dir")" \( -name '*.cpp' -o -name '*.hpp' \) \
+               ! -path '*/.git/*' \
                ! -path '*/src/cpp-common/vendor/*' \
-               ! -path '*/src/cpp-common/nlohmann/json.hpp' \
                ! -path '*/src/plugins/ctf/common/metadata/parser.*' \
                ! -path '*/src/plugins/ctf/common/metadata/lexer.*' \
                -print0 | xargs -P"$(nproc)" -n1 -t -0 "${formatter[@]}"