summaryrefslogtreecommitdiff
path: root/git/cmd.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-11-15 16:21:47 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-11-15 16:21:47 +0100
commit7aba59a2609ec768d5d495dafd23a4bce8179741 (patch)
tree9d999b14a7817b1ceeb23ddd1cded446ace9255c /git/cmd.py
parent9c39afa1f85f3293ad2ccef684ff62bf0a36e73c (diff)
parentff13922f6cfb11128b7651ddfcbbd5cad67e477f (diff)
downloadgitpython-7aba59a2609ec768d5d495dafd23a4bce8179741.tar.gz
Merge branch 'johnsca-sf-master' into 0.3
Merge all fixes from https://github.com/gitpython-developers/GitPython/pull/134
Diffstat (limited to 'git/cmd.py')
-rw-r--r--git/cmd.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/git/cmd.py b/git/cmd.py
index 5425d8ff..a1780de7 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -88,6 +88,7 @@ class Git(LazyMixin):
# try to kill it
try:
os.kill(self.proc.pid, 2) # interrupt signal
+ self.proc.wait() # ensure process goes away
except OSError:
pass # ignore error when process already died
except AttributeError: