m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-15 06:43:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up error reporting on :Gwrite in diff

Browse Source
This commit is contained in:
Tim Pope
2019-07-20 23:35:24 -04:00
parent 8d584c199a
commit 387cb5c2a0
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
autoload/fugitive.vim
View File

@@ -3766,13 +3766,15 @@ function! s:WriteCommand(line1, line2, range, count, bang, mods, reg, arg, args)
silent write silent write
setlocal buftype=nowrite setlocal buftype=nowrite
if matchstr(getline(2),'index [[:xdigit:]]\+\.\.\zs[[:xdigit:]]\{7\}') ==# fugitive#RevParse(':0:'.filename)[0:6] if matchstr(getline(2),'index [[:xdigit:]]\+\.\.\zs[[:xdigit:]]\{7\}') ==# fugitive#RevParse(':0:'.filename)[0:6]
let err = s:TreeChomp('apply', '--cached', '--reverse', '--', expand('%:p')) let [message, exec_error] = s:ChompError(['apply', '--cached', '--reverse', '--', expand('%:p')])
else else
let err = s:TreeChomp('apply', '--cached', '--', expand('%:p')) let [message, exec_error] = s:ChompError(['apply', '--cached', '--', expand('%:p')])
endif endif
if err !=# '' if exec_error
let v:errmsg = split(err,"\n")[0] echohl ErrorMsg
return 'echoerr v:errmsg' echo message
echohl NONE
return ''
elseif a:bang elseif a:bang
return 'bdelete' return 'bdelete'
else else