Merge pull request pre-commit#320 from pre-commit/use_show_toplevel

asottile · asottile · commit d6cf62532de9 · 2015-12-18T11:33:51.000-05:00
Use rev-parse --show-toplevel
diff --git a/pre_commit/git.py b/pre_commit/git.py
@@ -7,6 +7,7 @@
 import re
 
 from pre_commit.errors import FatalError
+from pre_commit.util import CalledProcessError
 from pre_commit.util import cmd_output
 from pre_commit.util import memoize_by_cwd
 
@@ -15,16 +16,12 @@
 
 
 def get_root():
-    path = os.getcwd()
-    while path != os.path.normpath(os.path.join(path, '../')):
-        if os.path.exists(os.path.join(path, '.git')):
-            return path
-        else:
-            path = os.path.normpath(os.path.join(path, '../'))
-    raise FatalError(
-        'Called from outside of the gits. '
-        'Please cd to a git repository.'
-    )
+    try:
+        return cmd_output('git', 'rev-parse', '--show-toplevel')[1].strip()
+    except CalledProcessError:
+        raise FatalError(
+            'Called from outside of the gits.  Please cd to a git repository.'
+        )
 
 
 def is_in_merge_conflict():
diff --git a/tests/git_test.py b/tests/git_test.py
@@ -15,7 +15,7 @@
 def test_get_root_at_root(tempdir_factory):
     path = git_dir(tempdir_factory)
     with cwd(path):
-        assert git.get_root() == path
+        assert os.path.normcase(git.get_root()) == os.path.normcase(path)
 
 
 def test_get_root_deeper(tempdir_factory):
@@ -24,7 +24,7 @@ def test_get_root_deeper(tempdir_factory):
     foo_path = os.path.join(path, 'foo')
     os.mkdir(foo_path)
     with cwd(foo_path):
-        assert git.get_root() == path
+        assert os.path.normcase(git.get_root()) == os.path.normcase(path)
 
 
 def test_get_root_not_git_dir(tempdir_factory):
diff --git a/tests/runner_test.py b/tests/runner_test.py
@@ -24,8 +24,8 @@ def test_create_sets_correct_directory(tempdir_factory):
     path = git_dir(tempdir_factory)
     with cwd(path):
         runner = Runner.create()
-        assert runner.git_root == path
-        assert os.getcwd() == path
+        assert os.path.normcase(runner.git_root) == os.path.normcase(path)
+        assert os.path.normcase(os.getcwd()) == os.path.normcase(path)
 
 
 def test_create_changes_to_git_root(tempdir_factory):
@@ -38,8 +38,8 @@ def test_create_changes_to_git_root(tempdir_factory):
         assert os.getcwd() != path
 
         runner = Runner.create()
-        assert runner.git_root == path
-        assert os.getcwd() == path
+        assert os.path.normcase(runner.git_root) == os.path.normcase(path)
+        assert os.path.normcase(os.getcwd()) == os.path.normcase(path)
 
 
 def test_config_file_path():
