pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-03-30 18:26:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Look for all 3 git conflict markers in check_merge_conflict.

Browse source
This commit is contained in:
Anton I. Sipos 2025-12-19 13:16:42 -08:00
parent 5dcc56558c
commit 19609da705
No known key found for this signature in database
GPG key ID: 327E0FD283F0D9AD
2 changed files with 42 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pre_commit_hooks/check_merge_conflict.py
View file

@ -9,11 +9,10 @@ from pre_commit_hooks.util import cmd_output
CONFLICT_PATTERNS = [
b'<<<<<<< ',
b'======= ',
b'=======\r\n',
b'=======\n',
b'=======',
b'>>>>>>> ',
]
N = len(CONFLICT_PATTERNS)
def is_in_merge() -> bool:
@ -40,15 +39,21 @@ def main(argv: Sequence[str] | None = None) -> int:
retcode = 0
for filename in args.filenames:
with open(filename, 'rb') as inputfile:
expected_conflict_pattern_index = 0
for i, line in enumerate(inputfile, start=1):
for pattern in CONFLICT_PATTERNS:
if line.startswith(pattern):
# Look for conflict patterns in order
if line.startswith(
CONFLICT_PATTERNS[expected_conflict_pattern_index]
):
expected_conflict_pattern_index += 1
if expected_conflict_pattern_index == N:
print(
f'{filename}:{i}: Merge conflict string '
f'{pattern.strip().decode()!r} found',
f"{filename}:{i}: Merge conflict string "
f"{CONFLICT_PATTERNS[-1].strip().decode()!r} "
f"found",
)
retcode = 1
break
return retcode