diff options
author | Barry Scott <barry@barrys-emacs.org> | 2016-06-06 09:27:20 +0100 |
---|---|---|
committer | Barry Scott <barry@barrys-emacs.org> | 2016-06-06 09:27:20 +0100 |
commit | 35658887753da7da9a32a297346fd4ee6e53d45c (patch) | |
tree | 64e857e2ea087d489369937e42ea7374d7e04e84 /git/cmd.py | |
parent | 08a0fad2c9dcdfe0bbc980b8cd260b4be5582381 (diff) | |
parent | e0b21f454ea43a5f67bc4905c641d95f8b6d96fd (diff) | |
download | gitpython-35658887753da7da9a32a297346fd4ee6e53d45c.tar.gz |
Merge remote-tracking branch 'upstream/master' into pr-cmd-raise-with-stderr-on-error
Diffstat (limited to 'git/cmd.py')
-rw-r--r-- | git/cmd.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -287,7 +287,7 @@ class Git(LazyMixin): return # can be that nothing really exists anymore ... - if os is None: + if os is None or os.kill is None: return # try to kill it |