summaryrefslogtreecommitdiff
path: root/git/util.py
diff options
context:
space:
mode:
authorDominic <yobmod@gmail.com>2021-08-06 17:42:46 +0100
committerGitHub <noreply@github.com>2021-08-06 17:42:46 +0100
commitea1a03af3b4135ce297cb8ac9d9bd38c6cdfd0b2 (patch)
treef11d860722df07860df6fb339a2e896e4be72d54 /git/util.py
parent8e226ed8865f0ad78cec6b83f0b5436ce11017bf (diff)
parentec04ea01dbbab9c36105dfc3e34c94bbbbf298b2 (diff)
downloadgitpython-ea1a03af3b4135ce297cb8ac9d9bd38c6cdfd0b2.tar.gz
Merge pull request #1314 from eric-wieser/patch-1
Do not call get_user_id if it is not needed
Diffstat (limited to 'git/util.py')
-rw-r--r--git/util.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/git/util.py b/git/util.py
index 4f82219e..b81332ea 100644
--- a/git/util.py
+++ b/git/util.py
@@ -705,7 +705,11 @@ class Actor(object):
setattr(actor, attr, val)
except KeyError:
if config_reader is not None:
- setattr(actor, attr, config_reader.get_value('user', cvar, default()))
+ try:
+ val = config_reader.get('user', cvar)
+ except Exception:
+ val = default()
+ setattr(actor, attr, val)
# END config-reader handling
if not getattr(actor, attr):
setattr(actor, attr, default())