summaryrefslogtreecommitdiff
path: root/git/cmd.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2011-01-06 15:23:22 +0100
committerSebastian Thiel <byronimo@gmail.com>2011-01-06 15:23:22 +0100
commit1ab169407354d4b9512447cd9c90e8a31263c275 (patch)
treef757fb9563689031bde22652d06329adfa8f1b5d /git/cmd.py
parent56488ced0fae2729b1e9c72447b005efdcd4fea7 (diff)
parentb424f87a276e509dcaaee6beb10ca00c12bb7d29 (diff)
downloadgitpython-1ab169407354d4b9512447cd9c90e8a31263c275.tar.gz
Merge remote branch 'ahgutsche/master'
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 60887f5d..af8417b7 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -87,6 +87,7 @@ class Git(object):
"""Wait for the process and return its status code.
:raise GitCommandError: if the return status is not 0"""
+ sleep_on_gui_present_osx_crashfix()
status = self.proc.wait()
if status != 0:
raise GitCommandError(self.args, status, self.proc.stderr.read())