Commit ef46131a authored by Jelmer Vernooij's avatar Jelmer Vernooij

Fix use of get_user_identity call in dulwich.

parent a943ca67
......@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 11),
python3-all,
python3-breezy (>= 3.0.0~bzr7140),
python3-breezy.tests,
python3-dulwich,
python3-dulwich (>= 0.19.7),
python3-debian,
python3-setuptools
Standards-Version: 4.2.1
......@@ -20,7 +20,7 @@ Architecture: all
Depends: dos2unix,
python3-breezy (>= 3.0.0~bzr7140),
python3-debian,
python3-dulwich,
python3-dulwich (>= 0.19.7),
${misc:Depends},
${python3:Depends}
Recommends: lintian
......
......@@ -283,7 +283,8 @@ def get_committer(tree):
"""
# TODO(jelmer): Perhaps this logic should be in Breezy?
if getattr(tree.branch.repository, '_git', None):
return tree.branch.repository._git._get_user_identity()
cs = tree.branch.repository._git.get_config_stack()
return tree.branch.repository._git._get_user_identity(cs)
else:
config = tree.branch.get_config_stack()
return config.get('email')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment