summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-10-15 09:01:28 +0200
committerSebastian Thiel <byronimo@gmail.com>2015-10-15 09:01:28 +0200
commitdc8032d35a23bcc105f50b1df69a1da6fe291b90 (patch)
tree6c2634bc48f0dbb004924201ae544db89dcc8f06
parent7e58e6a0d78f5298252b2d6c4b0431427ec6d152 (diff)
downloadgitpython-revert-357-autointerrupt_deadlock_fix.tar.gz
Revert "fix(cmd): fixed deadlock when stderr buffer overflow"revert-357-autointerrupt_deadlock_fix
-rw-r--r--git/cmd.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/git/cmd.py b/git/cmd.py
index 6cf4d8a6..3cdc68ab 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -310,11 +310,11 @@ class Git(LazyMixin):
"""Wait for the process and return its status code.
:raise GitCommandError: if the return status is not 0"""
- stderr_value = self.proc.communicate()[1]
- if self.proc.returncode != 0:
- raise GitCommandError(self.args, status, stderr_value)
+ status = self.proc.wait()
+ if status != 0:
+ raise GitCommandError(self.args, status, self.proc.stderr.read())
# END status handling
- return self.proc.returncode
+ return status
# END auto interrupt
class CatFileContentStream(object):