From 9e4a4545dd513204efb6afe40e4b50c3b5f77e50 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Sun, 16 Oct 2016 15:09:38 +0200
Subject: fix(surrogateescape): enable on py2, fix tests

---
 git/objects/fun.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'git/objects/fun.py')

diff --git a/git/objects/fun.py b/git/objects/fun.py
index a144ba7e..d5b3f902 100644
--- a/git/objects/fun.py
+++ b/git/objects/fun.py
@@ -2,6 +2,7 @@
 from stat import S_ISDIR
 from git.compat import (
     byte_ord,
+    safe_decode,
     defenc,
     xrange,
     text_type,
@@ -76,7 +77,7 @@ def tree_entries_from_data(data):
         # default encoding for strings in git is utf8
         # Only use the respective unicode object if the byte stream was encoded
         name = data[ns:i]
-        name = name.decode(defenc, 'surrogateescape')
+        name = safe_decode(name)
 
         # byte is NULL, get next 20
         i += 1
-- 
cgit v1.2.3