Allow configured email addresses to be pre-quoted as "<...>". (jelmer…

…#722) Allow configured email addresses to be pre-quoted as "<...>".
drmrd · Aug 25, 2019 · dd07fa9 · dd07fa9
1 parent 6afa2f6
commit dd07fa9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/dulwich/repo.py b/dulwich/repo.py
@@ -34,6 +34,7 @@
 import sys
 import stat
 import time
+import re
 
 from dulwich.errors import (
     NoIndexPresent,
@@ -112,6 +113,8 @@
 
 DEFAULT_REF = b'refs/heads/master'
 
+quoted_email_re = re.compile(br"^\s*<\s*(.*)\s*>\s*$")
+
 
 class InvalidUserIdentity(Exception):
     """User identity is not of the format 'user <email>'"""
@@ -175,6 +178,9 @@ def get_user_identity(config, kind=None):
         email = default_email
         if not isinstance(email, bytes):
             email = email.encode('utf-8')
+    m = quoted_email_re.match(email)
+    if m:
+        email = m.group(1)
     return (user + b" <" + email + b">")
 
 

diff --git a/dulwich/tests/test_repository.py b/dulwich/tests/test_repository.py
@@ -882,7 +882,7 @@ def test_commit_config_identity(self):
         r = self._repo
         c = r.get_config()
         c.set((b"user", ), b"name", b"Jelmer")
-        c.set((b"user", ), b"email", b"jelmer@apache.org")
+        c.set((b"user", ), b"email", b"<jelmer@apache.org>")
         c.write_to_path()
         commit_sha = r.do_commit(b'message')
         self.assertEqual(