diff options
| author | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-16 19:25:20 +0200 |
|---|---|---|
| committer | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-16 19:25:20 +0200 |
| commit | ec731f448d304dfe1f9269cc94de405aeb3a0665 (patch) | |
| tree | 86c9da1d65c79f271521b3efe525cfb339020457 /git/objects | |
| parent | b2efa1b19061ad6ed9d683ba98a88b18bff3bfd9 (diff) | |
| parent | 9e4a4545dd513204efb6afe40e4b50c3b5f77e50 (diff) | |
| download | gitpython-ec731f448d304dfe1f9269cc94de405aeb3a0665.tar.gz | |
Merge with #532, fix unicode filenames with escapesurogates
Diffstat (limited to 'git/objects')
| -rw-r--r-- | git/objects/fun.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/git/objects/fun.py b/git/objects/fun.py index 5c0f4819..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,11 +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] - try: - name = name.decode(defenc) - except UnicodeDecodeError: - pass - # END handle encoding + name = safe_decode(name) # byte is NULL, get next 20 i += 1 |