Close #171 PR: Attempt to detect user initiated git fetch. Fixes #162

This commit is contained in:
Mathias Fredriksson
2015-11-18 02:20:23 +07:00
committed by Sindre Sorhus
parent 95e7fd7de7
commit 9de635ee10
2 changed files with 9 additions and 1 deletions

View File

@@ -81,7 +81,12 @@ _async_worker() {
# Check for non-job commands sent to worker # Check for non-job commands sent to worker
case "$job" in case "$job" in
_killjobs) _killjobs)
kill -KILL ${${(v)jobstates##*:*:}%\=*} &>/dev/null # Do nothing in the worker when receiving the TERM signal
trap '' TERM
# Send TERM to the entire process group (PID and all children)
kill -TERM -$$ &>/dev/null
# Reset trap
trap - TERM
continue continue
;; ;;
esac esac

View File

@@ -100,6 +100,9 @@ prompt_pure_set_title() {
} }
prompt_pure_preexec() { prompt_pure_preexec() {
# attempt to detect and prevent prompt_pure_async_git_fetch from interfering with user initiated git or hub fetch
[[ $2 =~ (git|hub)\ .*(pull|fetch) ]] && async_flush_jobs 'prompt_pure'
prompt_pure_cmd_timestamp=$EPOCHSECONDS prompt_pure_cmd_timestamp=$EPOCHSECONDS
# shows the current dir and executed command in the title while a process is active # shows the current dir and executed command in the title while a process is active