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

Always use bash on unix.

Browse Source 
Vim is single-threaded so we can make life easier by using a known shell
and restoring the original one afterwards.
This commit is contained in:
Andy Stewart
2016-05-16 12:00:06 +01:00
parent 1937f06498
commit ba6e104848
3 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
autoload/gitgutter/diff.vim
View File

@@ -9,8 +9,6 @@ else
endif
let s:hunk_re = '^@@ -\(\d\+\),\?\(\d*\) +\(\d\+\),\?\(\d*\) @@'
let s:fish = &shell =~# 'fish'
let s:c_flag = gitgutter#utility#git_supports_command_line_config_override()
let s:temp_index = tempname()
@@ -54,14 +52,13 @@ let s:temp_buffer = tempname()
" does the filtering instead.
function! gitgutter#diff#run_diff(realtime, preserve_full_diff) abort
" Wrap compound commands in parentheses to make Windows happy.
" bash doesn't mind the parentheses; fish doesn't want them.
let cmd = s:fish ? '' : '('
" bash doesn't mind the parentheses.
let cmd = '('
let bufnr = gitgutter#utility#bufnr()
let tracked = getbufvar(bufnr, 'gitgutter_tracked') " i.e. tracked by git
if !tracked
let cmd .= 'git ls-files --error-unmatch '.gitgutter#utility#shellescape(gitgutter#utility#filename())
let cmd .= s:fish ? '; and ' : ' && ('
let cmd .= 'git ls-files --error-unmatch '.gitgutter#utility#shellescape(gitgutter#utility#filename()).' && ('
endif
if a:realtime
@@ -73,8 +70,7 @@ function! gitgutter#diff#run_diff(realtime, preserve_full_diff) abort
let blob_file .= '.'.extension
let buff_file .= '.'.extension
endif
let cmd .= 'git show '.blob_name.' > '.blob_file
let cmd .= s:fish ? '; and ' : ' && '
let cmd .= 'git show '.blob_name.' > '.blob_file.' && '
" Writing the whole buffer resets the '[ and '] marks and also the
" 'modified' flag (if &cpoptions includes '+'). These are unwanted
@@ -111,17 +107,14 @@ function! gitgutter#diff#run_diff(realtime, preserve_full_diff) abort
" differences are found. However we want to treat non-matches and
" differences as non-erroneous behaviour; so we OR the command with one
" which always exits with success (0).
let cmd .= s:fish ? '; or ' : ' || '
let cmd .= 'exit 0'
let cmd .= ' || exit 0'
endif
if !s:fish
let cmd .= ')'
let cmd .= ')'
if !tracked
let cmd .= ')'
endif
end
if !tracked
let cmd .= ')'
endif
let cmd = gitgutter#utility#command_in_directory_of_file(cmd)