diff --git a/vcsserver/remote/git_remote.py b/vcsserver/remote/git_remote.py
--- a/vcsserver/remote/git_remote.py
+++ b/vcsserver/remote/git_remote.py
@@ -1352,7 +1352,7 @@ class GitRemote(RemoteBase):
             _copts = []
             del opts['_bare']
         else:
-            _copts = ['-c', 'core.quotepath=false',]
+            _copts = ['-c', 'core.quotepath=false', '-c', 'advice.diverging=false']
         safe_call = False
         if '_safe' in opts:
             # no exc on failure