Patrick Georgi merged this change.
util/lint: Fix clang-format test and enable it by default
git diff needed to emit diffs without prefix (e.g. a/ and b/) for
clang-format-diff to be able to work.
Also require that the test succeeds, but note that it only runs on
trees whitelisted in $(top)/.clang-format-scope.
Change-Id: I7e9a32eb9281b5cb0b45506a206500fd1d315372
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31654
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
---
R util/lint/lint-stable-022-clang-format
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/util/lint/lint-022-clang-format b/util/lint/lint-stable-022-clang-format
similarity index 79%
rename from util/lint/lint-022-clang-format
rename to util/lint/lint-stable-022-clang-format
index 932d9c0..bd662e4 100755
--- a/util/lint/lint-022-clang-format
+++ b/util/lint/lint-stable-022-clang-format
@@ -30,5 +30,9 @@
fi
if [ $(clang-format $files_to_check | wc -l) -gt 0 ]; then
- git diff HEAD~..HEAD -- $files_to_check | clang-format-diff
+ 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
+ fi
fi
To view, visit change 31654. To unsubscribe, or for help writing mail filters, visit settings.