m-vim_plugins/vim-gitgutter
1
0
Fork 0
mirror of https://github.com/airblade/vim-gitgutter.git synced 2025-11-08 11:33:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use 'sh' as shell instead of configurable '/bin/sh'.

Browse Source 
sh isn't always at /bin/sh, e.g. on Android or Termux, but it is always
on the path.

See #360.
This commit is contained in:
Andy Stewart
2016-09-30 10:28:29 +01:00
parent 402257f920
commit 4f9c5b0f3e
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/gitgutter/async.vim
View File

@@ -24,7 +24,7 @@ function! gitgutter#async#execute(cmd) abort
if has('nvim') if has('nvim')
if has('unix') if has('unix')
let command = [g:gitgutter_sh, "-c", a:cmd] let command = ["sh", "-c", a:cmd]
elseif has('win32') elseif has('win32')
let command = ["cmd.exe", "/c", a:cmd] let command = ["cmd.exe", "/c", a:cmd]
else else
@@ -55,7 +55,7 @@ function! gitgutter#async#execute(cmd) abort
" only occurs when a file is not tracked by git). " only occurs when a file is not tracked by git).
if has('unix') if has('unix')
let command = [g:gitgutter_sh, "-c", a:cmd] let command = ["sh", "-c", a:cmd]
elseif has('win32') elseif has('win32')
" Help docs recommend {command} be a string on Windows. But I think " Help docs recommend {command} be a string on Windows. But I think
" they also say that will run the command directly, which I believe would " they also say that will run the command directly, which I believe would

2
autoload/gitgutter/utility.vim
View File

@@ -187,7 +187,7 @@ function! gitgutter#utility#use_known_shell() abort
let s:shell = &shell let s:shell = &shell
let s:shellcmdflag = &shellcmdflag let s:shellcmdflag = &shellcmdflag
let s:shellredir = &shellredir let s:shellredir = &shellredir
let &shell = g:gitgutter_sh let &shell = 'sh'
set shellcmdflag=-c set shellcmdflag=-c
set shellredir=>%s\ 2>&1 set shellredir=>%s\ 2>&1
endif endif

1
plugin/gitgutter.vim
View File

@@ -52,7 +52,6 @@ call s:set('g:gitgutter_avoid_cmd_prompt_on_windows', 1)
call s:set('g:gitgutter_async', 1) call s:set('g:gitgutter_async', 1)
call s:set('g:gitgutter_log', 0) call s:set('g:gitgutter_log', 0)
call s:set('g:gitgutter_git_executable', 'git') call s:set('g:gitgutter_git_executable', 'git')
call s:set('g:gitgutter_sh', '/bin/sh')
if !executable(g:gitgutter_git_executable) if !executable(g:gitgutter_git_executable)
call gitgutter#utility#warn('cannot find git. Please set g:gitgutter_git_executable.') call gitgutter#utility#warn('cannot find git. Please set g:gitgutter_git_executable.')