diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
index f612cda..ee4cde6 100644
--- a/plugin/fugitive.vim
+++ b/plugin/fugitive.vim
@@ -115,8 +115,8 @@ function! s:ExtractGitDir(path) abort
   let fn = fnamemodify(path,':s?[\/]$??')
   let ofn = ""
   let nfn = fn
-  while fn != ofn
-    if isdirectory(fn) && filereadable(fn . '/.git/HEAD')
+  while fn !=# ofn && fn !=# '/'
+    if filereadable(fn . '/.git/HEAD')
       return s:sub(simplify(fnamemodify(fn . '/.git',':p')),'\W$','')
     elseif fn =~ '\.git$' && filereadable(fn . '/HEAD')
       return s:sub(simplify(fnamemodify(fn,':p')),'\W$','')