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

This commit is contained in:
Jerome Reybert
2015-11-03 15:45:03 +01:00
committed by Tim Pope
parent dba8a0705d
commit f8aa87a4b5

View File

@@ -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