From c2fc1dc78a4c54a2ba5b49883fa246ac5b4fc39a Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 24 May 2015 00:41:21 -0400 Subject: [PATCH] Revert "Escape 2>&1 in the p4 detection" 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. --- autoload/sy/repo.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/sy/repo.vim b/autoload/sy/repo.vim index 2095c91..950244f 100644 --- a/autoload/sy/repo.vim +++ b/autoload/sy/repo.vim @@ -163,7 +163,7 @@ endfunction " Function: #get_diff_perforce {{{1 function! sy#repo#get_diff_perforce() abort 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] endfunction