pull upstream changes from gitstatus

This commit is contained in:
romkatv 2019-03-15 21:18:06 +01:00
parent e413af55bb
commit a24abeb33b

View file

@ -231,7 +231,7 @@ function gitstatus_start() {
zsh -c " zsh -c "
${(q)daemon} --parent-pid=$$ --dirty-max-index-size=${(q)max_dirty} --num-threads=$threads ${(q)daemon} --parent-pid=$$ --dirty-max-index-size=${(q)max_dirty} --num-threads=$threads
echo -nE $'bye\x1f0\x1e' echo -nE $'bye\x1f0\x1e'
rm -f ${(q)req_fifo} ${(q)resp_fifo} command rm -f ${(q)req_fifo} ${(q)resp_fifo}
" <&$req_fd >&$resp_fd 2>$log &! " <&$req_fd >&$resp_fd 2>$log &!
daemon_pid=$! daemon_pid=$!
@ -251,7 +251,7 @@ function gitstatus_start() {
local req_fifo=${(P)req_fifo_var} local req_fifo=${(P)req_fifo_var}
local resp_fifo=${(P)resp_fifo_var} local resp_fifo=${(P)resp_fifo_var}
[[ $daemon_pid -ge 0 ]] && kill -- -$daemon_pid &>/dev/null [[ $daemon_pid -ge 0 ]] && kill -- -$daemon_pid &>/dev/null
rm -f $req_fifo $resp_fifo command rm -f $req_fifo $resp_fifo
} }
add-zsh-hook zshexit _gitstatus_cleanup_${name} add-zsh-hook zshexit _gitstatus_cleanup_${name}
} }
@ -269,7 +269,7 @@ function gitstatus_start() {
[[ $daemon_pid -ge 0 ]] && kill -- -$daemon_pid &>/dev/null || true [[ $daemon_pid -ge 0 ]] && kill -- -$daemon_pid &>/dev/null || true
[[ $req_fd -ge 0 ]] && exec {req_fd}>&- || true [[ $req_fd -ge 0 ]] && exec {req_fd}>&- || true
[[ $resp_fd -ge 0 ]] && { zle -F $resp_fd || true } && { exec {resp_fd}>&- || true} [[ $resp_fd -ge 0 ]] && { zle -F $resp_fd || true } && { exec {resp_fd}>&- || true}
rm -f $req_fifo $resp_fifo command rm -f $req_fifo $resp_fifo
return 1 return 1
} }
} }