Merge with head. style.py was also missing an argument in one call to modified_lines.

[gem5.git] / util / style.py

diff --git a/util/style.py b/util/style.py
index 7238b980136b7bb7708954ad4850a9af749ad7a5..3d733638838b266a441bf76a5f4496b31fe8b52b 100644 (file)
--- a/util/style.py
+++ b/util/style.py
@@ -306,7 +306,7 @@ def check_whitespace(ui, repo, hooktype, node, parent1, parent2):
         lines = mdiff.splitnewlines(file_data)
         mod_lines = modified_lines(pctx[0].data(), file_data, len(lines))
         if len(pctx) == 2:
-            m2 = modified_lines(pctx[1].data(), file_data)
+            m2 = modified_lines(pctx[1].data(), file_data, len(lines))
             mod_lines = mod_lines & m2 # only the lines that are new in both
 
         fixonly = set()