diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2015-10-15 08:42:09 +0200 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2015-10-15 08:42:09 +0200 |
commit | 7e58e6a0d78f5298252b2d6c4b0431427ec6d152 (patch) | |
tree | 25db781ea4a89b55526bb4abc91face04fdd01dc /git/cmd.py | |
parent | 51f79ffeb829315c33ce273ae69baf0fdd1fbd1e (diff) | |
parent | 2cc8f1e3c6627f0b4da7cb6550f7252f76529d8e (diff) | |
download | gitpython-7e58e6a0d78f5298252b2d6c4b0431427ec6d152.tar.gz |
Merge pull request #357 from rikdev/autointerrupt_deadlock_fix
fix(cmd): fixed deadlock when stderr buffer overflow
Diffstat (limited to 'git/cmd.py')
-rw-r--r-- | git/cmd.py | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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""" - status = self.proc.wait() - if status != 0: - raise GitCommandError(self.args, status, self.proc.stderr.read()) + stderr_value = self.proc.communicate()[1] + if self.proc.returncode != 0: + raise GitCommandError(self.args, status, stderr_value) # END status handling - return status + return self.proc.returncode # END auto interrupt class CatFileContentStream(object): |