motiejus/dotfiles

commit f8aa87a4b5551052a41e25af80609e4624dcd58a (tree)
parent dba8a0705d95cda76d599bb7d09964d67741a5c5
Author: Jerome Reybert <jerome.reybert@kalray.eu>
Date:   Tue,  3 Nov 2015 15:45:03 +0100

Fix when $GIT_DIR is set and is not an absolute path

Diffstat:
M
plugin/fugitive.vim
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
@@ -143,11 +143,11 @@ function! fugitive#extract_git_dir(path) abort
       break
     endif
     if root ==# $GIT_WORK_TREE && fugitive#is_git_dir($GIT_DIR)
-      return $GIT_DIR
+      return simplify(fnamemodify(expand($GIT_DIR), ':p:s?[\/]$??'))
     endif
     if fugitive#is_git_dir($GIT_DIR)
       " Ensure that we've cached the worktree
-      call s:configured_tree($GIT_DIR)
+      call s:configured_tree(simplify(fnamemodify(expand($GIT_DIR), ':p:s?[\/]$??')))
       if has_key(s:dir_for_worktree, root)
         return s:dir_for_worktree[root]
       endif