diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2011-01-06 15:23:22 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2011-01-06 15:23:22 +0100 |
| commit | 1ab169407354d4b9512447cd9c90e8a31263c275 (patch) | |
| tree | f757fb9563689031bde22652d06329adfa8f1b5d /git/diff.py | |
| parent | 56488ced0fae2729b1e9c72447b005efdcd4fea7 (diff) | |
| parent | b424f87a276e509dcaaee6beb10ca00c12bb7d29 (diff) | |
| download | gitpython-1ab169407354d4b9512447cd9c90e8a31263c275.tar.gz | |
Merge remote branch 'ahgutsche/master'
Diffstat (limited to 'git/diff.py')
| -rw-r--r-- | git/diff.py | 3 |
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 |