VimPlug/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-12-08 21:14:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Guard against empty filename checking for conflicts

Browse Source 
Closes https://github.com/tpope/vim-fugitive/issues/1287
This commit is contained in:
Tim Pope
2019-07-13 07:45:30 -04:00
parent 0c259e3016
commit 4da9fb8f43
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/fugitive.vim
View File

@@ -3995,7 +3995,7 @@ function! s:CompareAge(mine, theirs) abort
endfunction endfunction
function! s:IsConflicted() abort function! s:IsConflicted() abort
return !empty(s:TreeChomp('ls-files', '--unmerged', '--', expand('%:p'))) return len(@%) && !empty(s:ChompDefault('', 'ls-files', '--unmerged', '--', expand('%:p')))
endfunction endfunction
function! s:Diff(autodir, keepfocus, mods, ...) abort function! s:Diff(autodir, keepfocus, mods, ...) abort