From da4ab76d01012f74d91d59b59c3366f3654a5b33 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Fri, 18 Mar 2022 15:40:59 +0200 Subject: Fix clang-format git hook script It should be --extensions "cpp,h,hpp,c"; previously, I naively tested that it didn't bother .json files, but I not if it'll actually trigger for e.g. a .h file... --- kde-modules/kde-git-commit-hooks/clang-format.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-modules/kde-git-commit-hooks/clang-format.sh b/kde-modules/kde-git-commit-hooks/clang-format.sh index c8bf7565..3e072768 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 --extensions ".cpp, .h, .hpp, .c" -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" @@ -13,6 +13,6 @@ if [[ "$output" == *"no modified files to format"* ]]; then exit 0; fi if [[ "$output" == *"clang-format did not modify any files"* ]]; then exit 0; fi echo "ERROR: You have unformatted changes, please format your files. You can do this using the following commands:" -echo " git clang-format --force # format the changed parts" -echo " git clang-format --diff # preview the changes done by the formatter" +echo " git clang-format --extensions 'cpp,h,hpp,c' --force # format the changed parts" +echo " git clang-format --extensions 'cpp,h,hpp,c' --diff # preview the changes done by the formatter" exit 1 -- cgit v1.2.1