From 278529098918f2bdcf43526e584c102c78097b43 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 27 Feb 2019 22:02:04 +0100 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/31654 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- .../{lint-022-clang-format => lint-stable-022-clang-format} | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) rename util/lint/{lint-022-clang-format => lint-stable-022-clang-format} (79%) 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 932d9c0d50..bd662e472f 100755 --- a/util/lint/lint-022-clang-format +++ b/util/lint/lint-stable-022-clang-format @@ -30,5 +30,9 @@ if [ -z "$files_to_check" ]; then 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