From d0243ad1a59ef58b8711fe124f0c6a9a8abce86c Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Fri, 29 Aug 2014 19:39:56 +0200 Subject: [PATCH] git-gui/gitk: Do not use a Cygwin-specific kill flag 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 --- git-gui/git-gui.sh | 4 +--- gitk-git/gitk | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 3f1fe0a856..a85395dccc 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -669,9 +669,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 } diff --git a/gitk-git/gitk b/gitk-git/gitk index 90e83a62fd..6609819e0a 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -445,7 +445,7 @@ proc stop_instance {inst} { set pid [pid $fd] if {$::tcl_platform(platform) eq {windows}} { - exec kill -f $pid + exec taskkill /pid $pid } else { exec kill $pid }