summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <sthiel@thoughtworks.com>2019-07-20 15:11:36 +0800
committerSebastian Thiel <sthiel@thoughtworks.com>2019-07-20 15:11:36 +0800
commitda8aeec539da461b2961ca72049df84bf30473e1 (patch)
treea90722893f1dea42e55faa1a6e91d7c6a171ba15
parentc73b239bd10ae2b3cff334ace7ca7ded44850cbd (diff)
parent096027bc4870407945261eecfe81706e32b1bfcd (diff)
downloadgitpython-da8aeec539da461b2961ca72049df84bf30473e1.tar.gz
Merge branch 'master' of https://github.com/sstancu/GitPython into sstancu-master
-rw-r--r--AUTHORS1
m---------git/ext/gitdb0
-rw-r--r--git/remote.py7
3 files changed, 4 insertions, 4 deletions
diff --git a/AUTHORS b/AUTHORS
index 5d9d5c91..5f42f856 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -31,5 +31,6 @@ Contributors are:
-David Host <hostdm _at_ outlook.com>
-A. Jesse Jiryu Davis <jesse _at_ emptysquare.net>
-Steven Whitman <ninloot _at_ gmail.com>
+-Stefan Stancu <stefan.stancu _at_ gmail.com>
Portions derived from other open source works and are clearly marked.
diff --git a/git/ext/gitdb b/git/ext/gitdb
-Subproject 3e71833044718f60be36ac47494668469a2a235
+Subproject c0fd43b5ff8c356fcf9cdebbbbd1803a502b465
diff --git a/git/remote.py b/git/remote.py
index 0965c1f6..4f32540f 100644
--- a/git/remote.py
+++ b/git/remote.py
@@ -544,10 +544,9 @@ class Remote(LazyMixin, Iterable):
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: