From 6891caf73735ea465c909de8dc13129cc98c47f7 Mon Sep 17 00:00:00 2001
From: Barry Scott <barry@barrys-emacs.org>
Date: Mon, 6 Jun 2016 10:45:16 +0100
Subject: Can get a str object from stream.read rather then bytes.

Convert to the expected bytes.
---
 git/cmd.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'git/cmd.py')

diff --git a/git/cmd.py b/git/cmd.py
index f992a399..633aedcb 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -338,7 +338,10 @@ class Git(LazyMixin):
 
             def read_all_from_possibly_closed_stream(stream):
                 try:
-                    return stderr + stream.read()
+                    last_stderr = stream.read()
+                    if type(last_stderr) == unicode:
+                        last_stderr = last_stderr.encode(defenc)
+                    return stderr + last_stderr
                 except ValueError:
                     return stderr or b''
 
-- 
cgit v1.2.1