summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/style.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/util/style.py b/util/style.py
index 3d7336388..866bef9b8 100644
--- a/util/style.py
+++ b/util/style.py
@@ -298,6 +298,9 @@ def check_whitespace(ui, repo, hooktype, node, parent1, parent2):
wctx = repo.workingctx()
for fname in modified:
+ if not whitespace_file(fname):
+ continue
+
fctx = wctx.filectx(fname)
pctx = fctx.parents()
assert len(pctx) in (1, 2)