summaryrefslogtreecommitdiff
path: root/git/cmd.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-11-17 13:53:33 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-11-17 13:53:33 +0100
commit7e231a4f184583fbac2d3ef110dacd1f015d5e1c (patch)
treeca0d2d0844b349265b1aca779baa4238c6ad93e7 /git/cmd.py
parenta40d848794133de7b6e028f2513c939d823767cb (diff)
parent3f277ba01f9a93fb040a365eef80f46ce6a9de85 (diff)
downloadgitpython-7e231a4f184583fbac2d3ef110dacd1f015d5e1c.tar.gz
Merge branch 'patch-1' of https://github.com/boppreh/GitPython into boppreh-patch-1
Adjusted patch to only run git command in shell mode on windows. Conflicts: git/cmd.py
Diffstat (limited to 'git/cmd.py')
-rw-r--r--git/cmd.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/git/cmd.py b/git/cmd.py
index 0f1a892d..9cc6b1fa 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -29,7 +29,6 @@ def dashify(string):
class Git(LazyMixin):
-
"""
The Git class manages communication with the Git binary.
@@ -348,6 +347,9 @@ class Git(LazyMixin):
stdin=istream,
stderr=PIPE,
stdout=PIPE,
+ # Prevent cmd prompt popups on windows by using a shell ... .
+ # See https://github.com/gitpython-developers/GitPython/pull/126
+ shell=sys.platform == 'win32',
close_fds=(os.name == 'posix'), # unsupported on linux
**subprocess_kwargs
)