diff options
| author |  Sebastian Schuberth <sschuberth@gmail.com> | 2014-10-23 21:30:54 +0200 |
|---|---|---|
| committer |  Pat Thoyts <patthoyts@users.sourceforge.net> | 2014-11-06 22:13:32 +0000 |
| commit | 3b422bc85495d93dd2e3f3ee1f7c792193393687 (patch) | |
| tree | 0892363756cbb91e4c6d6ed7b2c3dfa0630b16cd | |
| parent | git-gui: add configurable tab size to the diff view (diff) | |
| download | tgif-3b422bc85495d93dd2e3f3ee1f7c792193393687.tar.xz | |
git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows
Windows does not necessarily mean Cygwin, it could also be MSYS. The
latter ships with a version of "kill" that does not understand "-f". In
msysgit this was addressed shipping Cygwin's version of kill.
Properly fix this by using the stock Windows "taskkill" command instead,
which is available since Windows XP Professional.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| -rwxr-xr-x | git-gui.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/git-gui.sh b/git-gui.sh index bf68699616..dc53e9a8f5 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -670,9 +670,7 @@ proc kill_file_process {fd} { catch { if {[is_Windows]} { - # Use a Cygwin-specific flag to allow killing - # native Windows processes - exec kill -f $process + exec taskkill /pid $process } else { exec kill $process } |