summaryrefslogtreecommitdiff
path: root/util/style.py
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-08-18 19:41:08 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-08-18 19:41:08 -0700
commita874cb40ab9f22612b0609cbac2c739daebacbd5 (patch)
tree551e5aadc93be0ba3013e2b33272d08c78da01f9 /util/style.py
parent4bce50340f8fc1e1e0361cef1971dd127125d5a5 (diff)
parent464a51e29e858d6dc38847120868b36e97c8bb6d (diff)
downloadgem5-a874cb40ab9f22612b0609cbac2c739daebacbd5.tar.xz
Merge with head.
--HG-- extra : convert_revision : 6ce77b5bd4f43ddecd51ea8c66759e4b70d4ad82
Diffstat (limited to 'util/style.py')
-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)