Merge pull request #1564 from gidj/vcs-patch-fix

Use regex matching to prevent message from bubbling up
This commit is contained in:
Christian Brabandt 2017-09-18 19:54:38 +02:00 committed by GitHub
commit cfb107c75f
2 changed files with 2 additions and 2 deletions

View File

@ -17,7 +17,7 @@ endfunction
function! s:mq_output(buf, file)
let buf=a:buf
if !empty(a:buf)
if a:buf is# 'no patches applied' ||
if a:buf is# 'no patches applied ' ||
\ a:buf =~# "unknown command 'qtop'"
let buf = ''
elseif exists("b:mq") && b:mq isnot# buf

View File

@ -132,7 +132,7 @@ function! s:update_hg_branch(...)
else
" remove \n at the end of the command
let output=system(cmd)[0:-2]
if output is# 'no patches applied' ||
if output is# 'no patches applied ' ||
\ output =~# "unknown command 'qtop'"
let b:mq=''
else