summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2018-05-30 15:48:16 +0200
committerPatrick Georgi <pgeorgi@google.com>2018-05-30 17:11:51 +0000
commit9110c1766866da698d20dc5d1e4ce87d098e2812 (patch)
tree555dcb14aaa97cf8ec21e9bb6eb7fbef9fc8691c /util
parentf6081c2deb6cb0bf07634185630f9a94ab5cbbb8 (diff)
util/gitconfig: improve robustness of checkpatch in pre-commit
Users can have non-default configurations as to how git diff et al are presenting file names in diffs (default: a/ and b/ prefixes). checkpatch expects that and trims the first element, so enforce that configuration for the diff that's sent into it. Change-Id: I099795119456a73c900b31ce191c2d9e898a5c7e Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-on: https://review.coreboot.org/26694 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'util')
-rwxr-xr-xutil/gitconfig/pre-commit2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/gitconfig/pre-commit b/util/gitconfig/pre-commit
index 0f1306288e..2aed957df9 100755
--- a/util/gitconfig/pre-commit
+++ b/util/gitconfig/pre-commit
@@ -20,7 +20,7 @@ set -u # -o nounset
%MAKE% lint-stable
-PATCHDIFF=$(git diff --cached)
+PATCHDIFF=$(git diff --cached --src-prefix=a/ --dst-prefix=b/)
if printf "%s\n" "$PATCHDIFF" | grep -q "@@"; then
echo
echo "Running checkpatch"