Merge remote-tracking branch 'origin/master'

1 files changed, 5 insertions, 3 deletions

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 0da84f2f5..efe8cbe66 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -11,8 +11,9 @@ function git-fetch-all {
       return 0
     fi
 
-    # Do nothing if auto-fetch disabled
-    if [[ -z "$gitdir" || -f "$gitdir/NO_AUTO_FETCH" ]]; then
+    # Do nothing if auto-fetch is disabled or don't have permissions
+    if [[ ! -w "$gitdir" || -f "$gitdir/NO_AUTO_FETCH" ]] ||
+       [[ -f "$gitdir/FETCH_LOG" && ! -w "$gitdir/FETCH_LOG" ]]; then
       return 0
     fi
 
@@ -24,8 +25,9 @@ function git-fetch-all {
     fi
 
     # Fetch all remotes (avoid ssh passphrase prompt)
+    date -R &>! "$gitdir/FETCH_LOG"
     GIT_SSH_COMMAND="command ssh -o BatchMode=yes" \
-      command git fetch --all 2>/dev/null &>! "$gitdir/FETCH_LOG"
+      command git fetch --all 2>/dev/null &>> "$gitdir/FETCH_LOG"
   ) &|
 }