pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-08 20:44:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a new hook to forbid new submodules

Browse source
This commit is contained in:
Anthony Sottile 2016-11-30 09:56:42 -08:00
parent 7539d8bd1a
commit 70e405ede2
7 changed files with 75 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pre_commit_hooks/check_merge_conflict.py
View file

@ -2,7 +2,6 @@ from __future__ import print_function
import argparse
import os.path
import sys
CONFLICT_PATTERNS = [
b'<<<<<<< ',
@ -41,5 +40,6 @@ def detect_merge_conflict(argv=None):
return retcode
if __name__ == '__main__':
sys.exit(detect_merge_conflict())
exit(detect_merge_conflict())