Use in_git_dir in more places

This commit is contained in:
Anthony Sottile 2018-12-27 18:02:14 -08:00
parent 2af0b0b4f3
commit d46bbc486f
7 changed files with 88 additions and 143 deletions

View file

@ -65,9 +65,10 @@ def in_tmpdir(tempdir_factory):
@pytest.fixture
def in_git_dir(tmpdir):
with tmpdir.as_cwd():
repo = tmpdir.join('repo').ensure_dir()
with repo.as_cwd():
cmd_output('git', 'init')
yield tmpdir
yield repo
def _make_conflict():