---

yaml
---
r: 535
b: refs/heads/master
c: b4f9277
h: refs/heads/master
i:
  533: 041397f
  531: 1d790ed
  527: eb4c090
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 724d7235e546fb79009800700fd74328f8171b8c
+refs/heads/master: b4f92774d0b6b60b747f97344c18c5f51de18469

trunk/src/etc/tidy.py

@@ -1,10 +1,15 @@
 #!/usr/bin/python
 
-import sys, fileinput
+import sys, fileinput, subprocess
 
 err=0
 cols=78
 
+config_proc=subprocess.Popen([ "git", "config", "core.autocrlf" ],
+    stdout=subprocess.PIPE)
+result=config_proc.communicate()[0]
+autocrlf=result.strip() == b"true" if result is not None else False
+
 def report_err(s):
     global err
     print("%s:%d: %s" % (fileinput.filename(), fileinput.filelineno(), s))
@@ -14,10 +19,11 @@ def report_err(s):
     if line.find('\t') != -1 and fileinput.filename().find("Makefile") == -1:
         report_err("tab character")
 
-    if line.find('\r') != -1:
+    if not autocrlf and line.find('\r') != -1:
         report_err("CR character")
 
-    if len(line)-1 > cols:
+    line_len = len(line)-2 if autocrlf else len(line)-1
+    if line_len > cols:
         report_err("line longer than %d chars" % cols)