@@ -75,7 +75,6 @@ def _expand_path(p):
 
 
 class Repo(object):
-
     """Represents a git repository and allows you to query references,
     gather commit information, generate diffs, create and clone repositories query
     the log.
@@ -758,7 +757,7 @@ def init(cls, path=None, mkdir=True, **kwargs):
         # git command automatically chdir into the directory
         git = Git(path)
         git.init(**kwargs)
-        return Repo(path)
+        return cls(path)
 
     @classmethod
     def _clone(cls, git, url, path, odb_default_type, progress, **kwargs):
 
@@ -440,7 +440,7 @@ def test_references_and_objects(self, rw_dir):
         # [32-test_references_and_objects]
         private_key_file = os.path.join(rw_dir, 'id_rsa_deployment_key')
         with repo.git.sshkey(private_key_file):
-            # Note that we don't actually make the call here, as our test-setup doesn't permit it to 
+            # Note that we don't actually make the call here, as our test-setup doesn't permit it to
             # succeed.
             # It will in your case :)
             repo.remotes.origin.fetch
 
@@ -181,11 +181,26 @@ def test_environment(self, rw_dir):
         assert new_env == {'VARKEY': 'VARVALUE'}
         assert self.git.environment() == {}
 
-        rw_repo = Repo.init(os.path.join(rw_dir, 'repo'))
+        class TestRepo(Repo):
+            class GitCommandWrapperType(Git):
+                def _sshkey_script_path(self):
+                    path = os.path.join(rw_dir, 'failing-script.sh')
+                    stream = open(path, 'wt')
+                    stream.write("#!/usr/bin/env sh\n" +
+                                 "echo FOO\n")
+                    stream.close()
+                    os.chmod(path, 0o555)
+                    return path
+            # end Git
+        # end Repo
+
+        rw_repo = TestRepo.init(os.path.join(rw_dir, 'repo'))
         remote = rw_repo.create_remote('ssh-origin', "ssh://git@server/foo")
 
         with rw_repo.git.sshkey('doesntexist.key'):
-            remote.fetch()
+            try:
+                remote.fetch()
+            except GitCommandError as err:
+                assert 'FOO' in str(err)
+            # end
         # end
-
-