Merge branch 'master' of github.com:pre-commit/pre-commit

Conflicts:
	tests/git_test.py
This commit is contained in:
Ken Struys 2014-03-13 16:48:02 -07:00
commit 3b0f03d0e0
11 changed files with 243 additions and 160 deletions

View file

@ -16,14 +16,6 @@ def get_sha(git_repo):
with local.cwd(git_repo):
return (local['git']['log', '--format="%H"'] | local['head']['-n1'])().strip('"\n')
@pytest.yield_fixture
def empty_git_dir(tmpdir):
with local.cwd(tmpdir.strpath):
local['git']['init']()
yield tmpdir.strpath
@pytest.yield_fixture
def dummy_git_repo(empty_git_dir):
local['touch']['dummy']()