fix(cmd): fixed deadlock when stderr buffer overflow

rikdev · Рябченко Иван Константинович · commit 2cc8f1e3c662 · 2015-10-15T12:31:25.000+06:00
Fixed deadlock when using stderr=PIPE in Popen and Git generates enough output to a pipe such that it blocks waiting for the OS pipe buffer to accept more data (see https://docs.python.org/2/library/subprocess.html#subprocess.Popen.wait)
diff --git a/git/cmd.py b/git/cmd.py
@@ -310,11 +310,11 @@ def wait(self):
 """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):

-Original file line number
+Diff line change
 """Wait for the process and return its status code.
  :raise GitCommandError: if the return status is not 0"""
 -status=self.proc.wait()
 -ifstatus!=0:
 -raiseGitCommandError(self.args, status, self.proc.stderr.read())
 +stderr_value=self.proc.communicate()[1]
 +ifself.proc.returncode!=0:
 +raiseGitCommandError(self.args, status, stderr_value)
 # END status handling
 -returnstatus
 +returnself.proc.returncode
 # END auto interrupt
 classCatFileContentStream(object):