summaryrefslogtreecommitdiff
path: root/git/diff.py
diff options
context:
space:
mode:
authorAndreas Gutsche <andreas.h.gutsche@gmail.com>2011-01-06 15:21:09 +0100
committerAndreas Gutsche <andreas.h.gutsche@gmail.com>2011-01-06 15:21:09 +0100
commitb424f87a276e509dcaaee6beb10ca00c12bb7d29 (patch)
tree21eff20f9f86bb785837026f5ae46b2ad44e26ca /git/diff.py
parent46f63c30e30364eb04160df71056d4d34e97af21 (diff)
downloadgitpython-b424f87a276e509dcaaee6beb10ca00c12bb7d29.tar.gz
Added the bugfix code as a utility function to be reused wherever this specific subprocess bug occurs.
Diffstat (limited to 'git/diff.py')
-rw-r--r--git/diff.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/git/diff.py b/git/diff.py
index 48253c42..c2597bd9 100644
--- a/git/diff.py
+++ b/git/diff.py
@@ -10,6 +10,8 @@ from objects.util import mode_str_to_int
from exc import GitCommandError
from gitdb.util import hex_to_bin
+
+from util import sleep_on_gui_present_osx_crashfix
__all__ = ('Diffable', 'DiffIndex', 'Diff')
@@ -99,6 +101,7 @@ class Diffable(object):
diff_method = Diff._index_from_patch_format
index = diff_method(self.repo, proc.stdout)
+ sleep_on_gui_present_osx_crashfix()
status = proc.wait()
return index