From 7cb3191ccb1dc24ff21a9e41ec30d52f420c98e6 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Thu, 17 Mar 2022 12:57:00 +0200 Subject: KDEClangFormat: se the same source file extensions in clang-format script and target Previously the clang-format.sh git hook script didn't specify the file extensions to format; however it looks like with recent(?) clang-format versions 'git clang-format' will consider .json files if such files were changed by a commit, which makes the script fail, see: https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/254 Sepcify the file extensions by passing --extensions to 'git clang-format' command. Also add ".hpp" to the file extensions we format, and use the same list of file extensions everywhere. --- kde-modules/kde-git-commit-hooks/clang-format.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kde-modules/kde-git-commit-hooks') diff --git a/kde-modules/kde-git-commit-hooks/clang-format.sh b/kde-modules/kde-git-commit-hooks/clang-format.sh index 42a16a1d..c8bf7565 100755 --- a/kde-modules/kde-git-commit-hooks/clang-format.sh +++ b/kde-modules/kde-git-commit-hooks/clang-format.sh @@ -2,7 +2,7 @@ # Based on okular/hooks/pre-commit, credits go to Albert Astals Cid -readonly output=$(git clang-format -v --diff) +readonly output=$(git clang-format --extensions ".cpp, .h, .hpp, .c" -v --diff) if [[ ! -f .clang-format ]]; then echo "ERROR: no .clang-format file found in repository root, abort format" -- cgit v1.2.1