From ef869305cfffc31b30c145c95c81e3284b88c5ac Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Wed, 26 Jul 2017 10:38:42 -0600 Subject: util/gitconfig: update pre-commit script The previous pre-commit script generates an error when a commit doesn't actually generate a patch file. This happens in rare instances when the only change in a patch is to update file permissions. Update the pre-commit script to verify that there's actually a patch before calling checkpatch. Also print that we're running checkpatch so that it doesn't look like odd failures come from lint-stable. Fixes Bug #132 - Problem with `lint-stable` when changing mode of file Change-Id: I142610b6fc984b2b14fd6c634bc4e7f2880ba987 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/20781 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-by: Paul Menzel --- util/gitconfig/pre-commit | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'util') diff --git a/util/gitconfig/pre-commit b/util/gitconfig/pre-commit index 70cd6eade1..257f6964bb 100755 --- a/util/gitconfig/pre-commit +++ b/util/gitconfig/pre-commit @@ -1,3 +1,9 @@ #!/bin/sh %MAKE% lint-stable -git diff --cached | util/lint/checkpatch.pl --no-signoff -q - + +PATCHDIFF=$(git diff --cached) +if echo "$PATCHDIFF" | grep -q "@@"; then + echo + echo "Running checkpatch" + echo "$PATCHDIFF" | util/lint/checkpatch.pl --no-signoff -q - +fi -- cgit v1.2.3