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

azure pipelines [skip travis] [skip appveyor]

Browse source
This commit is contained in:
Anthony Sottile 2019-03-10 13:42:05 -07:00
parent 8171e47eb2
commit 8bb94f0bd4
10 changed files with 33 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/check_merge_conflict_test.py
View file

@ -22,7 +22,7 @@ def f1_is_a_conflict_file(tmpdir):
cmd_output('git', 'init', '--', repo1.strpath)
with repo1.as_cwd():
repo1_f1.ensure()
cmd_output('git', 'add', '--', repo1_f1.strpath)
cmd_output('git', 'add', '.')
cmd_output('git', 'commit', '--no-gpg-sign', '-m', 'commit1')
cmd_output('git', 'clone', repo1.strpath, repo2.strpath)
@ -77,7 +77,7 @@ def repository_pending_merge(tmpdir):
cmd_output('git', 'init', repo1.strpath)
with repo1.as_cwd():
repo1_f1.ensure()
cmd_output('git', 'add', '--', repo1_f1.strpath)
cmd_output('git', 'add', '.')
cmd_output('git', 'commit', '--no-gpg-sign', '-m', 'commit1')
cmd_output('git', 'clone', repo1.strpath, repo2.strpath)
@ -90,7 +90,7 @@ def repository_pending_merge(tmpdir):
# Commit in clone and pull without committing
with repo2.as_cwd():
repo2_f2.write('child\n')
cmd_output('git', 'add', '--', repo2_f2.strpath)
cmd_output('git', 'add', '.')
cmd_output('git', 'commit', '--no-gpg-sign', '-m', 'clone commit2')
cmd_output('git', 'pull', '--no-commit', '--no-rebase')
# We should end up in a pending merge