From 86d844680015d60043a404f0b021463027b89e43 Mon Sep 17 00:00:00 2001 From: Guy Kisel Date: Fri, 13 Mar 2015 16:32:21 -0700 Subject: [PATCH] Fix off by one error in line number enumeration --- pre_commit_hooks/check_merge_conflict.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pre_commit_hooks/check_merge_conflict.py b/pre_commit_hooks/check_merge_conflict.py index fc211bc..ac405b2 100644 --- a/pre_commit_hooks/check_merge_conflict.py +++ b/pre_commit_hooks/check_merge_conflict.py @@ -22,7 +22,7 @@ def detect_merge_conflict(argv=None): for i, line in enumerate(inputfile): for pattern in CONFLICT_PATTERNS: if line.startswith(pattern): - print(WARNING_MSG.format(pattern, filename, i)) + print(WARNING_MSG.format(pattern, filename, i + 1)) retcode = 1 return retcode