03_default_identity 681 B

1234567891011121314151617181920
  1. diff --git a/dulwich/repo.py b/dulwich/repo.py
  2. index 7ebeec8e..ddedb7ac 100644
  3. --- a/dulwich/repo.py
  4. +++ b/dulwich/repo.py
  5. @@ -168,9 +168,13 @@ def get_user_identity(config, kind=None):
  6. email = None
  7. default_user, default_email = _get_default_identity()
  8. if user is None:
  9. - user = default_user.encode('utf-8')
  10. + user = default_user
  11. + if not isinstance(user, bytes):
  12. + user = user.encode('utf-8')
  13. if email is None:
  14. - email = default_email.encode('utf-8')
  15. + email = default_email
  16. + if not isinstance(email, bytes):
  17. + email = email.encode('utf-8')
  18. return (user + b" <" + email + b">")