vim/vim-signify
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Escape 2>&1 in the p4 detection"

Browse Source 
This reverts commit 5cdf72acd17d3559e4b5a207dea2993ddd77f50d.

`shellescape()`, which is what `sy#util#escape()` is a front-end to, is
only supposed to escape a single element of an argv list. In this case,
it's being used to escape multiple -- `p4 info 2>&1 >`. None of that
should be escaped anyway, because they need to be interpreted by the
shell.
This commit is contained in:
James McCoy 2015-05-24 00:41:21 -04:00
parent f11fd14457
commit c2fc1dc78a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/sy/repo.vim
View File

@ -163,7 +163,7 @@ endfunction
" Function: #get_diff_perforce {{{1 " Function: #get_diff_perforce {{{1
function! sy#repo#get_diff_perforce() abort function! sy#repo#get_diff_perforce() abort
let diffoptions = has_key(g:signify_diffoptions, 'perforce') ? g:signify_diffoptions.perforce : '' let diffoptions = has_key(g:signify_diffoptions, 'perforce') ? g:signify_diffoptions.perforce : ''
let diff = system(sy#util#escape('p4 info 2>&1 >') . sy#util#devnull() . ' && env P4DIFF=diff p4 diff -dU0 '. diffoptions .' '. sy#util#escape(b:sy.path)) let diff = system('p4 info 2>&1 >' . sy#util#devnull() . ' && env P4DIFF=diff p4 diff -dU0 '. diffoptions .' '. sy#util#escape(b:sy.path))
return v:shell_error ? [0, ''] : [1, diff] return v:shell_error ? [0, ''] : [1, diff]
endfunction endfunction