Merge pull request #695 from rgerkin/issue694

Byron · web-flow · commit 28cbb953ce01 · 2017-11-19T15:59:23.000+01:00
Fixes issue #694
diff --git a/git/remote.py b/git/remote.py
@@ -536,10 +536,18 @@ def urls(self):
             #    and: http://stackoverflow.com/a/32991784/548792
             #
             if 'Unknown subcommand: get-url' in str(ex):
-                remote_details = self.repo.git.remote("show", self.name)
-                for line in remote_details.split('\n'):
-                    if '  Push  URL:' in line:
-                        yield line.split(': ')[-1]
+                try:
+                    remote_details = self.repo.git.remote("show", self.name)
+                    for line in remote_details.split('\n'):
+                        if '  Push  URL:' in line:
+                            yield line.split(': ')[-1]
+                except GitCommandError as ex:
+                    if any([msg in str(ex) for msg in ['correct access rights','cannot run ssh']]):
+                        # If ssh is not setup to access this repository, see issue 694                                                                                            
+                        result = Git().execute(['git','config','--get','remote.%s.url' % self.name])
+                        yield result
+                    else:
+                        raise ex
             else:
                 raise ex
 
