summaryrefslogtreecommitdiff
path: root/git/cmd.py
diff options
context:
space:
mode:
authorDmitry Nikulin <dmitr-nikulin@mail.ru>2018-07-24 23:43:48 +0300
committerSebastian Thiel <byronimo@gmail.com>2018-08-05 13:56:21 +0200
commitb3d9b8df38dacfe563b1dd7abb9d61b664c21186 (patch)
tree9d5c9d58a5d7a504ab89fe5d3cc4be657405b29e /git/cmd.py
parente1d2f4bc85da47b5863589a47b9246af0298f016 (diff)
downloadgitpython-b3d9b8df38dacfe563b1dd7abb9d61b664c21186.tar.gz
Fix TypeError in git.execute(..., output_stream=file)
This fixes #619 - raise GitCommandError(not TypeError) when output_stream is set in git.execute
Diffstat (limited to 'git/cmd.py')
-rw-r--r--git/cmd.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git/cmd.py b/git/cmd.py
index 54537a41..30028487 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -794,7 +794,7 @@ class Git(LazyMixin):
else:
max_chunk_size = max_chunk_size if max_chunk_size and max_chunk_size > 0 else io.DEFAULT_BUFFER_SIZE
stream_copy(proc.stdout, output_stream, max_chunk_size)
- stdout_value = output_stream
+ stdout_value = proc.stdout.read()
stderr_value = proc.stderr.read()
# strip trailing "\n"
if stderr_value.endswith(b"\n"):