summaryrefslogtreecommitdiff
path: root/git/cmd.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-05 17:59:22 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-05 17:59:22 +0100
commite1060a2a8c90c0730c3541811df8f906dac510a7 (patch)
tree1c29ef00a756be7e88aeb43cfa847dbf2e6f3079 /git/cmd.py
parent8a308613467a1510f8dac514624abae4e10c0779 (diff)
downloadgitpython-e1060a2a8c90c0730c3541811df8f906dac510a7.tar.gz
test_commit works once again
Diffstat (limited to 'git/cmd.py')
-rw-r--r--git/cmd.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/git/cmd.py b/git/cmd.py
index c536b43c..2bff3310 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -320,6 +320,7 @@ class Git(LazyMixin):
always be created with a pipe due to issues with subprocess.
This merely is a workaround as data will be copied from the
output pipe to the given output stream directly.
+ Judging from the implementation, you shouldn't use this flag !
:param subprocess_kwargs:
Keyword arguments to be passed to subprocess.Popen. Please note that
@@ -411,9 +412,13 @@ class Git(LazyMixin):
else:
raise GitCommandError(command, status, stderr_value)
+
+ if isinstance(stdout_value, bytes): # could also be output_stream
+ stdout_value = stdout_value.decode(defenc)
+
# Allow access to the command's status code
if with_extended_output:
- return (status, stdout_value, stderr_value)
+ return (status, stdout_value, stderr_value.decode(defenc))
else:
return stdout_value