From ce828b6ae8b272cc65d8ea500ab00c100035bf46 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Sat, 31 Aug 2019 02:46:42 +0200 Subject: util/lint: make clang-format non-fatal The current clang-format configuration is completely broken. It forces one to change the code style of patches before pushing them, only to find out that checkpatch now complains about it. This means newcomers get scared away, and developers only get angered and frustrated about it, and end up working around clang-format's requirements anyway. For now, make clang-format's complaints non-fatal, reducing them to text noise. However, since clang-format is currently unusable, reverting it out would be preferred. Change-Id: Iffa8934efa1c27c04e10545f66d8f9976e74c367 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/35176 Tested-by: build bot (Jenkins) Reviewed-by: Jacob Garber Reviewed-by: Patrick Georgi --- util/lint/check-style | 9 ++++++--- util/lint/lint-stable-022-clang-format | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'util/lint') diff --git a/util/lint/check-style b/util/lint/check-style index 2237ed6295..f72d7b42c5 100755 --- a/util/lint/check-style +++ b/util/lint/check-style @@ -137,7 +137,10 @@ cat "$patch" printf "\nYou can apply these changes with:\n git apply $patch\n" printf "(may need to be called from the root directory of your repository)\n" -printf "Aborting commit. Apply changes and commit again or skip checking with" -printf " --no-verify (not recommended).\n" -exit 1 +# FIXME: clang-format is currently unusable, so don't abort the commit. +# printf "Aborting commit. Apply changes and commit again or skip checking with" +# printf " --no-verify (not recommended).\n" +# exit 1 + +exit 0 diff --git a/util/lint/lint-stable-022-clang-format b/util/lint/lint-stable-022-clang-format index bd662e472f..48f51a8e77 100755 --- a/util/lint/lint-stable-022-clang-format +++ b/util/lint/lint-stable-022-clang-format @@ -33,6 +33,6 @@ if [ $(clang-format $files_to_check | wc -l) -gt 0 ]; then if [ "$(git diff --no-prefix HEAD~..HEAD -- $files_to_check | clang-format-diff)" != "" ]; then echo "Coding style mismatch. The following patch fixes it:" git diff --no-prefix HEAD~..HEAD -- $files_to_check | clang-format-diff - exit 1 + exit 0 fi fi -- cgit v1.2.3