diff options
| author | Aaron N. Brock <AaronNBrock@gmail.com> | 2019-11-22 10:40:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 10:40:37 -0500 |
| commit | 420e9d789a26223df9dd7df7625daf032a3f5083 (patch) | |
| tree | 0ccfcd55671fd4d68b61a91188c984563384ee30 /plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | |
| parent | 5722677884e85ae910daab4b4624745af74540e6 (diff) | |
| parent | 76d6b0256398ad1becbc304a78f51bbacfee50e5 (diff) | |
| download | zsh-420e9d789a26223df9dd7df7625daf032a3f5083.tar.gz zsh-420e9d789a26223df9dd7df7625daf032a3f5083.tar.bz2 zsh-420e9d789a26223df9dd7df7625daf032a3f5083.zip | |
Merge branch 'master' into colorize-chroma-support
Diffstat (limited to 'plugins/git-auto-fetch/git-auto-fetch.plugin.zsh')
| -rw-r--r-- | plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh index 56ab86dbe..5c42c21a7 100644 --- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh +++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh @@ -1,16 +1,17 @@ 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` && + (`command git rev-parse --is-inside-work-tree 2>/dev/null` && + dir=`command 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 2>/dev/null &>! $dir/FETCH_LOG &) + GIT_SSH_COMMAND="command ssh -o BatchMode=yes" \ + command git fetch --all 2>/dev/null &>! $dir/FETCH_LOG &) } function git-auto-fetch { - `git rev-parse --is-inside-work-tree 2>/dev/null` || return - guard="`git rev-parse --git-dir`/NO_AUTO_FETCH" + `command git rev-parse --is-inside-work-tree 2>/dev/null` || return + guard="`command git rev-parse --git-dir`/NO_AUTO_FETCH" (rm $guard 2>/dev/null && echo "${fg_bold[green]}enabled${reset_color}") || |