Skip to content
Snippets Groups Projects
Commit 3a0c9f39 authored by Paul Netherwood's avatar Paul Netherwood Committed by Jérôme Reybert
Browse files

Use cygpath if present to create top level dir for Cygwin/MSYS2 compatibility

parent 94762b13
Branches
Tags
Show whitespace changes
Inline Side-by-side
Showing
with 7 additions and 0 deletions
autoload/magit/git.vim
+ 7
− 0
View file @ 3a0c9f39
...@@ -52,6 +52,9 @@ function! magit#git#is_work_tree(path) ...@@ -52,6 +52,9 @@ function! magit#git#is_work_tree(path)
try try
call magit#utils#chdir(a:path) call magit#utils#chdir(a:path)
let top_dir=system(g:magit_git_cmd . " rev-parse --show-toplevel") let top_dir=system(g:magit_git_cmd . " rev-parse --show-toplevel")
if ( executable("cygpath") )
let top_dir = magit#utils#strip(system("cygpath " . top_dir))
endif
if ( v:shell_error != 0 ) if ( v:shell_error != 0 )
return '' return ''
endif endif
...@@ -72,6 +75,10 @@ function! magit#git#set_top_dir(path) ...@@ -72,6 +75,10 @@ function! magit#git#set_top_dir(path)
let top_dir=magit#utils#strip( let top_dir=magit#utils#strip(
\ system(g:magit_git_cmd . " rev-parse --show-toplevel")) . "/" \ system(g:magit_git_cmd . " rev-parse --show-toplevel")) . "/"
let git_dir=magit#utils#strip(system(g:magit_git_cmd . " rev-parse --git-dir")) . "/" let git_dir=magit#utils#strip(system(g:magit_git_cmd . " rev-parse --git-dir")) . "/"
if ( executable("cygpath") )
let top_dir = magit#utils#strip(system("cygpath " . top_dir))
let git_dir = magit#utils#strip(system("cygpath " . git_dir))
endif
catch 'shell_error' catch 'shell_error'
call magit#sys#print_shell_error() call magit#sys#print_shell_error()
throw 'set_top_dir_error' throw 'set_top_dir_error'
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment