diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2019-09-11 18:19:51 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2019-09-11 18:19:51 -0600 |
| commit | d676c1553254309beca5bb9a8edb43fbe09a7169 (patch) | |
| tree | d0bb04b6487e6fedbb2b2370a894fccd19d4c567 /plugins/git-auto-fetch | |
| parent | fb141c2257f648cd29b64cbd3f2ca9123f6e427f (diff) | |
| parent | ddd359dd668f448856438304bedfe952d1749efd (diff) | |
| download | zsh-d676c1553254309beca5bb9a8edb43fbe09a7169.tar.gz zsh-d676c1553254309beca5bb9a8edb43fbe09a7169.tar.bz2 zsh-d676c1553254309beca5bb9a8edb43fbe09a7169.zip | |
Merge remote-tracking branch 'orig/master'
Diffstat (limited to 'plugins/git-auto-fetch')
| -rw-r--r-- | plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh index 1d20bc04b..56ab86dbe 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 { @@ -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 |