Commit6d3d94c

committed

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

Fix `git push` hanging when stdout/stderr is big

2 parentsa66cfe9 +3d0e05c commit6d3d94cCopy full SHA for 6d3d94c

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -127,10 +127,11 @@ def get_push_info(repo, remotename_or_url, proc, progress):`
`127`	`127`	`# we hope stdout can hold all the data, it should ...`
`128`	`128`	`# read the lines manually as it will use carriage returns between the messages`
`129`	`129`	`# to override the previous one. This is why we read the bytes manually`
`130`		`-digest_process_messages(proc.stderr,progress)`
	`130`	`+stdout,stderr=proc.communicate()`
	`131`	`+digest_process_messages(StringIO(stderr),progress)`
`131`	`132`
`132`	`133`	`output=IterableList('name')`
`133`		`-forlineinproc.stdout.readlines():`
	`134`	`+forlineinstdout.splitlines():`
`134`	`135`	`try:`
`135`	`136`	`output.append(CmdPushInfo._from_line(repo,remotename_or_url,line))`
`136`	`137`	`exceptValueError:`
`@@ -139,7 +140,6 @@ def get_push_info(repo, remotename_or_url, proc, progress):`
`139`	`140`	`# END exception handling`
`140`	`141`	`# END for each line`
`141`	`142`
`142`		`-finalize_process(proc)`
`143`	`143`	`returnoutput`
`144`	`144`
`145`	`145`

Comments

(0)