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

Added --assume-in-merge option for check-merge-conflict

Browse source 
Fixes #300
This commit is contained in:
Vinay Karanam 2018-06-26 23:34:04 +05:30
parent 9bf684c131
commit 64b9f3dcf0
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pre_commit_hooks/check_merge_conflict.py
View file

@ -26,9 +26,10 @@ def is_in_merge():
def detect_merge_conflict(argv=None): def detect_merge_conflict(argv=None):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('filenames', nargs='*') parser.add_argument('filenames', nargs='*')
parser.add_argument('--assume-in-merge', action='store_true')
args = parser.parse_args(argv) args = parser.parse_args(argv)
if not is_in_merge(): if not is_in_merge() and not args.assume_in_merge:
return 0 return 0
retcode = 0 retcode = 0

11
tests/check_merge_conflict_test.py
View file

@ -128,5 +128,12 @@ def test_ignores_binary_files():
def test_does_not_care_when_not_in_a_merge(tmpdir): def test_does_not_care_when_not_in_a_merge(tmpdir):
tmpdir.join('README.md').write('problem\n=======\n') f = tmpdir.join('README.md')
assert detect_merge_conflict(['README.md']) == 0 f.write_binary(b'problem\n=======\n')
assert detect_merge_conflict([str(f.realpath())]) == 0
def test_care_when_assumed_merge(tmpdir):
f = tmpdir.join('README.md')
f.write_binary(b'problem\n=======\n')
assert detect_merge_conflict([str(f.realpath()), '--assume-in-merge']) == 1