Kaynağa Gözat

Add patch 03_default_identity.

Jelmer Vernooij 6 yıl önce
ebeveyn
işleme
ddd60066c7
3 değiştirilmiş dosya ile 22 ekleme ve 0 silme
  1. 1 0
      debian/changelog
  2. 20 0
      debian/patches/03_default_identity
  3. 1 0
      debian/patches/series

+ 1 - 0
debian/changelog

@@ -1,6 +1,7 @@
 dulwich (0.19.11-1) UNRELEASED; urgency=medium
 
   * New upstream version.
+  * Add patch 03_default_identity.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Thu, 07 Feb 2019 03:13:59 +0000
 

+ 20 - 0
debian/patches/03_default_identity

@@ -0,0 +1,20 @@
+diff --git a/dulwich/repo.py b/dulwich/repo.py
+index 7ebeec8e..ddedb7ac 100644
+--- a/dulwich/repo.py
++++ b/dulwich/repo.py
+@@ -168,9 +168,13 @@ def get_user_identity(config, kind=None):
+             email = None
+     default_user, default_email = _get_default_identity()
+     if user is None:
+-        user = default_user.encode('utf-8')
++        user = default_user
++        if not isinstance(user, bytes):
++            user = user.encode('utf-8')
+     if email is None:
+-        email = default_email.encode('utf-8')
++        email = default_email
++        if not isinstance(email, bytes):
++            email = email.encode('utf-8')
+     return (user + b" <" + email + b">")
+ 
+ 

+ 1 - 0
debian/patches/series

@@ -1,2 +1,3 @@
 01_no_urllib3_pypy
 02_skip_flappy_test
+03_default_identity