summaryrefslogtreecommitdiff
path: root/misc/hooks
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-04-09 15:02:09 +0200
committerRémi Verschelde <rverschelde@gmail.com>2017-04-09 15:03:39 +0200
commitfa2d5b91dc390a11262859e5309351ba58842901 (patch)
tree46757016a21d4e750f33d9e244bd0828c83188a0 /misc/hooks
parent3fd10ff6f095eb57cb7c293f44e15c34bd09088e (diff)
squish: Update to upstream version 1.15
Also fix clang-format pre-commit hook to ignore thirdparty files.
Diffstat (limited to 'misc/hooks')
-rwxr-xr-xmisc/hooks/pre-commit-clang-format5
1 files changed, 5 insertions, 0 deletions
diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format
index 88c43fc1f5..0971ebe23a 100755
--- a/misc/hooks/pre-commit-clang-format
+++ b/misc/hooks/pre-commit-clang-format
@@ -82,6 +82,11 @@ $DELETE_OLD_PATCHES && rm -f /tmp/$prefix*.patch
# create one patch containing all changes to the files
git diff-index --cached --diff-filter=ACMR --name-only $against -- | while read file;
do
+ # ignore thirdparty files
+ if grep -q "thirdparty" <<< $file; then
+ continue;
+ fi
+
# ignore file if we do check for file extensions and the file
# does not match any of the extensions specified in $FILE_EXTS
if $PARSE_EXTS && ! matches_extension "$file"; then