Ensure git remote urls (multiple) are read from the correct git repo config

Stefan Stancu · Stefan Stancu · commit 096027bc4870 · 2019-04-05T19:21:27.000+02:00
diff --git a/AUTHORS b/AUTHORS
@@ -29,5 +29,6 @@ Contributors are:
 -Tim Swast <swast _at_ google.com>
 -William Luc Ritchie
 -David Host <hostdm _at_ outlook.com>
+-Stefan Stancu <stefan.stancu _at_ gmail.com>
 
 Portions derived from other open source works and are clearly marked.
diff --git a/git/remote.py b/git/remote.py
@@ -544,10 +544,9 @@ def urls(self):
 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
+ remote_details = self.repo.git.config('--get-all', 'remote.%s.url' % self.name)
+ for line in remote_details.split('\n'):
+ yield line
 else:
 raise ex
 else:

-Original file line number
+Diff line change
 exceptGitCommandErrorasex:
 ifany(msginstr(ex) formsgin ['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]
 - )
 -yieldresult
 +remote_details=self.repo.git.config('--get-all', 'remote.%s.url'%self.name)
 +forlineinremote_details.split('\n'):
 +yieldline
 else:
 raiseex
 else: