third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-04-15 18:11:48 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 91dceb7e12 into 1be4e4f82e

Browse source
This commit is contained in:
vinay karanam 2017-04-19 05:01:14 +00:00 • committed by GitHub
commit ec7a95b703
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/conftest.py
View file

@ -45,21 +45,35 @@ def in_tmpdir(tempdir_factory):
def _make_conflict():
cmd_output('git', 'checkout', 'origin/master', '-b', 'foo')
cmd_output('git', 'checkout', 'origin/master', '-b', 'common_branch')
with io.open('common_file', 'w') as common_file:
common_file.write('common line\n')
cmd_output('git', 'add', 'common_file')
cmd_output('git', 'commit', '-m', 'common_file')
cmd_output('git', 'checkout', 'common_branch', '-b', 'foo')
with io.open('conflict_file', 'w') as conflict_file:
conflict_file.write('herp\nderp\n')
cmd_output('git', 'add', 'conflict_file')
with io.open('foo_only_file', 'w') as foo_only_file:
foo_only_file.write('foo')
cmd_output('git', 'add', 'foo_only_file')
with io.open('common_file', 'a') as common_file:
common_file.write('end\nline\n')
cmd_output('git', 'add', 'common_file')
cmd_output('git', 'commit', '-m', 'conflict_file')
cmd_output('git', 'checkout', 'origin/master', '-b', 'bar')
cmd_output('git', 'checkout', 'common_branch', '-b', 'bar')
with io.open('conflict_file', 'w') as conflict_file:
conflict_file.write('harp\nddrp\n')
cmd_output('git', 'add', 'conflict_file')
with io.open('bar_only_file', 'w') as bar_only_file:
bar_only_file.write('bar')
cmd_output('git', 'add', 'bar_only_file')
with io.open('common_file', 'r') as common_file:
common = common_file.read()
with io.open('common_file', 'w') as common_file:
common_file.write('start\nline\n')
common_file.write(common)
cmd_output('git', 'add', 'common_file')
cmd_output('git', 'commit', '-m', 'conflict_file')
cmd_output('git', 'merge', 'foo', retcode=None)