Merge "Repo: improve error detection for new ssh connections"

1 files changed, 5 insertions, 1 deletions

diff --git a/git_config.py b/git_config.py
index 09c4b48f..f76cd04e 100644
--- a/git_config.py
+++ b/git_config.py
@@ -464,9 +464,13 @@ def _open_ssh(host, port=None):
              % (host,port, str(e)), file=sys.stderr)
       return False
 
+    time.sleep(1)
+    ssh_died = (p.poll() is not None)
+    if ssh_died:
+      return False
+
     _master_processes.append(p)
     _master_keys.add(key)
-    time.sleep(1)
     return True
   finally:
     _master_keys_lock.release()