1 files changed, 16 insertions, 4 deletions
diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 949709e4c..e9946ef3f 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -1,7 +1,10 @@
-function git-fetch-on-chpwd {
+GIT_AUTO_FETCH_INTERVAL=${GIT_AUTO_FETCH_INTERVAL:=60}
+
+function git-fetch-all {
   (`git rev-parse --is-inside-work-tree 2>/dev/null` &&
   dir=`git rev-parse --git-dir` &&
   [[ ! -f $dir/NO_AUTO_FETCH ]] &&
+  (( `date +%s` - `date -r $dir/FETCH_LOG +%s` > $GIT_AUTO_FETCH_INTERVAL )) &&
   git fetch --all &>! $dir/FETCH_LOG &)
 }
 
@@ -15,6 +18,15 @@ function git-auto-fetch {
     echo "${fg_bold[red]}disabled${reset_color}")
 }
 
-chpwd_functions+=(git-fetch-on-chpwd)
-git-fetch-on-chpwd
-unset git-fetch-on-chpwd
+eval "original-$(declare -f zle-line-init)"
+
+function zle-line-init () {
+  git-fetch-all
+  original-zle-line-init
+}
+zle -N zle-line-init
+
+# chpwd_functions+=(git-fetch-on-chpwd)
+# git-fetch-on-chpwd
+unset git-auto-fetch
+unset original-zle-line-init