| commit | 70e405ede2dce7593ac1e51d0c0530a763585df8 | [log] [tgz] |
|---|---|---|
| author | Anthony Sottile <asottile@umich.edu> | Wed Nov 30 09:56:42 2016 -0800 |
| committer | Anthony Sottile <asottile@umich.edu> | Wed Nov 30 09:56:42 2016 -0800 |
| tree | e41ec2cedaa57d08a2612229d90a7a1f6a03c8f1 | |
| parent | 7539d8bd1a00a3c1bfd34cdb606d3a6372e83469 [diff] [blame] |
Add a new hook to forbid new submodules
diff --git a/pre_commit_hooks/check_merge_conflict.py b/pre_commit_hooks/check_merge_conflict.py index 4a98843..d986998 100644 --- a/pre_commit_hooks/check_merge_conflict.py +++ b/pre_commit_hooks/check_merge_conflict.py
@@ -2,7 +2,6 @@ import argparse import os.path -import sys CONFLICT_PATTERNS = [ b'<<<<<<< ', @@ -41,5 +40,6 @@ return retcode + if __name__ == '__main__': - sys.exit(detect_merge_conflict()) + exit(detect_merge_conflict())