From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Thu, 23 Oct 2014 19:30:54 +0000 (+0200)
Subject: git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows
X-Git-Tag: gitgui-0.20.0~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3b422bc85495d93dd2e3f3ee1f7c792193393687?ds=inline;hp=--cc

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>
---

3b422bc85495d93dd2e3f3ee1f7c792193393687
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
 		}