Merge pull request #184 from SurveyMonkey/GH-145_fix_git_push_hang

Byron · Byron · commit 6d3d94c1e647 · 2014-08-17T16:13:09.000+02:00
Fix `git push` hanging when stdout/stderr is big
diff --git a/git/db/cmd/base.py b/git/db/cmd/base.py
@@ -127,10 +127,11 @@ def get_push_info(repo, remotename_or_url, proc, progress):
     # we hope stdout can hold all the data, it should ...
     # read the lines manually as it will use carriage returns between the messages
     # to override the previous one. This is why we read the bytes manually
-    digest_process_messages(proc.stderr, progress)
+    stdout, stderr = proc.communicate()
+    digest_process_messages(StringIO(stderr), progress)
 
     output = IterableList('name')
-    for line in proc.stdout.readlines():
+    for line in stdout.splitlines():
         try:
             output.append(CmdPushInfo._from_line(repo, remotename_or_url, line))
         except ValueError:
@@ -139,7 +140,6 @@ def get_push_info(repo, remotename_or_url, proc, progress):
         # END exception handling
     # END for each line
 
-    finalize_process(proc)
     return output
 
 
