Commitf11fdf1

committed

remote,#519: FIX1-of-2 double-decoding push-infos

+ When `universal_lines==True` (515a6b9) must tel`handle_process_output` to stop decoding strings.

1 parentcf2335a commitf11fdf1Copy full SHA for f11fdf1

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,8 @@ def stdout_handler(line):`
`681`	`681`	`# END for each line`
`682`	`682`
`683`	`683`	`try:`
`684`		`-handle_process_output(proc,stdout_handler,progress_handler,finalize_process)`
	`684`	`+handle_process_output(proc,stdout_handler,progress_handler,finalize_process,`
	`685`	`+decode_stdout=False,decode_stderr=False)`
`685`	`686`	`exceptException:`
`686`	`687`	`iflen(output)==0:`
`687`	`688`	`raise`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,10 @@ def remote_repo_creator(self):`
`258`	`258`	`# We assume in good faith that we didn't start the daemon - but make sure we kill it anyway`
`259`	`259`	`# Of course we expect it to work here already, but maybe there are timing constraints`
`260`	`260`	`# on some platforms ?`
`261`		`-ifgdisnotNone:`
	`261`	`+try:`
`262`	`262`	`gd.proc.terminate()`
	`263`	`+exceptExceptionasex:`
	`264`	`+log.debug("Ignoring %r while terminating proc after %r.",ex,e)`
`263`	`265`	`log.warning('git(%s) ls-remote failed due to:%s',`
`264`	`266`	`rw_repo.git_dir,e)`
`265`	`267`	`ifis_win:`
`@@ -296,8 +298,10 @@ def remote_repo_creator(self):`
`296`	`298`	`os.chdir(prev_cwd)`
`297`	`299`
`298`	`300`	`finally:`
`299`		`-ifgdisnotNone:`
	`301`	`+try:`
`300`	`302`	`gd.proc.kill()`
	`303`	`+except:`
	`304`	`+pass## Either it has died (and we're here), or it won't die, again here...`
`301`	`305`
`302`	`306`	`rw_repo.git.clear_cache()`
`303`	`307`	`rw_remote_repo.git.clear_cache()`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# This module is part of GitPython and is released under`
`5`	`5`	`# the BSD License: http://www.opensource.org/licenses/bsd-license.php`
	`6`	`+from __future__importunicode_literals`
`6`	`7`
`7`	`8`	`importos`
`8`	`9`	`importre`

Comments

(0)