From 773a5697f1d79de4d55512117a7dcaf7b225c633 Mon Sep 17 00:00:00 2001 From: Andy Stewart Date: Tue, 13 Aug 2019 15:45:29 +0100 Subject: [PATCH] Warn user when git rejects patch. --- autoload/gitgutter/hunk.vim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autoload/gitgutter/hunk.vim b/autoload/gitgutter/hunk.vim index a7deb64..6dedfff 100644 --- a/autoload/gitgutter/hunk.vim +++ b/autoload/gitgutter/hunk.vim @@ -234,6 +234,9 @@ function! s:stage(hunk_diff) call gitgutter#utility#system( \ gitgutter#utility#cd_cmd(bufnr, g:gitgutter_git_executable.' '.g:gitgutter_git_args.' apply --cached --unidiff-zero - '), \ diff) + if v:shell_error + call gitgutter#utility#warn('patch does not apply') + endif " Refresh gitgutter's view of buffer. call gitgutter#process_buffer(bufnr, 1)