Revert "Don't complain about \r when core.autocrlf is on in Git"
This reverts commit 828afaa2fa
.
This commit is contained in:
parent
828afaa2fa
commit
724d7235e5
1 changed files with 3 additions and 10 deletions
|
@ -1,16 +1,10 @@
|
|||
#!/usr/bin/python
|
||||
|
||||
import sys, fileinput, subprocess
|
||||
import sys, fileinput
|
||||
|
||||
err=0
|
||||
cols=78
|
||||
|
||||
try:
|
||||
result=subprocess.check_output([ "git", "config", "core.autocrlf" ])
|
||||
autocrlf=result.strip() == b"true"
|
||||
except CalledProcessError:
|
||||
autocrlf=False
|
||||
|
||||
def report_err(s):
|
||||
global err
|
||||
print("%s:%d: %s" % (fileinput.filename(), fileinput.filelineno(), s))
|
||||
|
@ -20,11 +14,10 @@ for line in fileinput.input(openhook=fileinput.hook_encoded("utf-8")):
|
|||
if line.find('\t') != -1 and fileinput.filename().find("Makefile") == -1:
|
||||
report_err("tab character")
|
||||
|
||||
if not autocrlf and line.find('\r') != -1:
|
||||
if line.find('\r') != -1:
|
||||
report_err("CR character")
|
||||
|
||||
line_len = len(line)-2 if autocrlf else len(line)-1
|
||||
if line_len > cols:
|
||||
if len(line)-1 > cols:
|
||||
report_err("line longer than %d chars" % cols)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue