Commit7e231a4

committed

Merge branch 'patch-1' ofhttps://github.com/boppreh/GitPython into boppreh-patch-1

Adjusted patch to only run git command in shell mode on windows.Conflicts:git/cmd.py

2 parentsa40d848 +3f277ba commit7e231a4Copy full SHA for 7e231a4

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ def dashify(string):`
`29`	`29`
`30`	`30`
`31`	`31`	`classGit(LazyMixin):`
`32`		`-`
`33`	`32`	`"""`
`34`	`33`	`The Git class manages communication with the Git binary.`
`35`	`34`
`@@ -348,6 +347,9 @@ def execute(self, command,`
`348`	`347`	`stdin=istream,`
`349`	`348`	`stderr=PIPE,`
`350`	`349`	`stdout=PIPE,`
	`350`	`+# Prevent cmd prompt popups on windows by using a shell ... .`
	`351`	`+# See https://github.com/gitpython-developers/GitPython/pull/126`
	`352`	`+shell=sys.platform=='win32',`
`351`	`353`	`close_fds=(os.name=='posix'),# unsupported on linux`
`352`	`354`	`**subprocess_kwargs`
`353`	`355`	`)`

Comments

(0)