Move empty_git_dir out of pytest fixtures.

tests/git_test.py

@@ -1,21 +1,32 @@
+from __future__ import absolute_import
+
+import os.path
 import pytest
 from plumbum import local
 
 from pre_commit import git
+from testing.fixtures import git_dir
 
 
-def test_get_root(empty_git_dir):
-    assert git.get_root() == empty_git_dir
-
-    foo = local.path('foo')
-    foo.mkdir()
-
-    with local.cwd(foo):
-        assert git.get_root() == empty_git_dir
+def test_get_root_at_root(tmpdir_factory):
+    path = git_dir(tmpdir_factory)
+    with local.cwd(path):
+        assert git.get_root() == path
 
 
-def test_is_not_in_merge_conflict(empty_git_dir):
-    assert git.is_in_merge_conflict() is False
+def test_get_root_deeper(tmpdir_factory):
+    path = git_dir(tmpdir_factory)
+
+    foo_path = os.path.join(path, 'foo')
+    os.mkdir(foo_path)
+    with local.cwd(foo_path):
+        assert git.get_root() == path
+
+
+def test_is_not_in_merge_conflict(tmpdir_factory):
+    path = git_dir(tmpdir_factory)
+    with local.cwd(path):
+        assert git.is_in_merge_conflict() is False
 
 
 def test_is_in_merge_conflict(in_merge_conflict):