summaryrefslogtreecommitdiff
path: root/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
diff options
context:
space:
mode:
authorSyphdias <syphdias+git@gmail.com>2019-11-18 20:14:07 +0100
committerMarc Cornellà <marc.cornella@live.com>2019-11-18 20:14:07 +0100
commit26df8a22741ea4bb5264233344e42ce900fd26b6 (patch)
treebc726f0ee7703e0d1d4f78595cf6245fbf8e107e /plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
parent4888d4ad1aefc9fa73d3b62500facaa1d97f31d8 (diff)
downloadzsh-26df8a22741ea4bb5264233344e42ce900fd26b6.tar.gz
zsh-26df8a22741ea4bb5264233344e42ce900fd26b6.tar.bz2
zsh-26df8a22741ea4bb5264233344e42ce900fd26b6.zip
git-auto-fetch: stop plugin from asking for ssh-key passphrase (#8399)
Diffstat (limited to 'plugins/git-auto-fetch/git-auto-fetch.plugin.zsh')
-rw-r--r--plugins/git-auto-fetch/git-auto-fetch.plugin.zsh11
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}") ||