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

Adjust git dir when checking for merge in worktree

Browse source
This commit is contained in:
Ersin Yildirim 2021-10-04 21:50:38 +02:00 • committed by Anthony Sottile
parent e35ba8d463
commit 07af54024c
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/check_merge_conflict_test.py
View file

@ -135,3 +135,15 @@ def test_care_when_assumed_merge(tmpdir):
f = tmpdir.join('README.md')
f.write_binary(b'problem\n=======\n')
assert main([str(f.realpath()), '--assume-in-merge']) == 1
def test_worktree_merge_conflicts(f1_is_a_conflict_file, tmpdir):
worktree = tmpdir.join('worktree')
cmd_output('git', 'worktree', 'add', str(worktree))
with worktree.as_cwd():
cmd_output(
'git', 'pull', '--no-rebase', 'origin', 'master', retcode=None,
)
msg = f1_is_a_conflict_file.join('.git/worktrees/worktree/MERGE_MSG')
assert msg.exists()
test_merge_conflicts_git()