summaryrefslogtreecommitdiff
path: root/git/util.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2018-10-14 13:01:14 +0200
committerSebastian Thiel <byronimo@gmail.com>2018-10-14 13:01:14 +0200
commita1634dc48b39ecca11dc39fd8bbf9f1d8f1b7be6 (patch)
treee7bdea614314abcb2c778fc09b5a930c8337f5fa /git/util.py
parent89df64132ccd76568ade04b5cf4e68cb67f0c5c0 (diff)
downloadgitpython-a1634dc48b39ecca11dc39fd8bbf9f1d8f1b7be6.tar.gz
Apply fix for #564
As suggested in this comment https://github.com/gitpython-developers/GitPython/issues/564#issuecomment-298257402
Diffstat (limited to 'git/util.py')
-rw-r--r--git/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git/util.py b/git/util.py
index 1186d311..a3b1fbfb 100644
--- a/git/util.py
+++ b/git/util.py
@@ -386,7 +386,7 @@ class RemoteProgress(object):
# handle
# Counting objects: 4, done.
# Compressing objects: 50% (1/2) \rCompressing objects: 100% (2/2) \rCompressing objects: 100% (2/2), done.
- self._cur_line = line
+ self._cur_line = line = line.decode('utf-8') if isinstance(line, bytes) else line
if len(self.error_lines) > 0 or self._cur_line.startswith(('error:', 'fatal:')):
self.error_lines.append(self._cur_line)
return []