From 7ad3acc8faa151e307c82b659f884205ef47012b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 27 Jan 2021 17:04:13 +0100 Subject: Merging upstream version 2.9.3. Signed-off-by: Daniel Baumann --- pre_commit/meta_hooks/check_useless_excludes.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pre_commit/meta_hooks/check_useless_excludes.py') diff --git a/pre_commit/meta_hooks/check_useless_excludes.py b/pre_commit/meta_hooks/check_useless_excludes.py index db6865c..12be03f 100644 --- a/pre_commit/meta_hooks/check_useless_excludes.py +++ b/pre_commit/meta_hooks/check_useless_excludes.py @@ -47,8 +47,10 @@ def check_useless_excludes(config_file: str) -> int: # the defaults applied during runtime hook = apply_defaults(hook, MANIFEST_HOOK_DICT) names = classifier.filenames - types, exclude_types = hook['types'], hook['exclude_types'] - names = classifier.by_types(names, types, exclude_types) + types = hook['types'] + types_or = hook['types_or'] + exclude_types = hook['exclude_types'] + names = classifier.by_types(names, types, types_or, exclude_types) include, exclude = hook['files'], hook['exclude'] if not exclude_matches_any(names, include, exclude): print( -- cgit v1.2.3