From c7a7b70e074be0ecc50d1447c6161207f01984dc Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Mon, 1 Jul 2019 23:10:59 +1000 Subject: git-auto-fetch: silence stderr output (#7970) Redirect stderr to avoid printing errors to the console when the ssh key is not unlocked. --- plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/git-auto-fetch') diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh index 1d20bc04b..745c669b5 100644 --- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh +++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh @@ -5,7 +5,7 @@ function git-fetch-all { dir=`git rev-parse --git-dir` && [[ ! -f $dir/NO_AUTO_FETCH ]] && (( `date +%s` - `date -r $dir/FETCH_LOG +%s 2>/dev/null || echo 0` > $GIT_AUTO_FETCH_INTERVAL )) && - git fetch --all &>! $dir/FETCH_LOG &) + git fetch --all 2>/dev/null &>! $dir/FETCH_LOG &) } function git-auto-fetch { -- cgit v1.2.3-70-g09d2 From 28232904bec1e8e15da52ae048a8a31ef7fac67b Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Tue, 13 Aug 2019 18:19:07 +0200 Subject: git-auto-fetch: override zle-line-init only if it exists --- plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'plugins/git-auto-fetch') diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh index 745c669b5..56ab86dbe 100644 --- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh +++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh @@ -18,10 +18,18 @@ function git-auto-fetch { echo "${fg_bold[red]}disabled${reset_color}") } -eval "override-git-auto-fetch-$(declare -f zle-line-init)" - -function zle-line-init () { - git-fetch-all - override-git-auto-fetch-zle-line-init -} +# Override zle-line-init if it exists +if (( $+functions[zle-line-init] )); then + eval "override-git-auto-fetch-$(declare -f zle-line-init)" + + function zle-line-init () { + git-fetch-all + override-git-auto-fetch-zle-line-init + } +else + function zle-line-init () { + git-fetch-all + } +fi + zle -N zle-line-init -- cgit v1.2.3-70-g09d2