From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Thu, 23 Oct 2014 19:30:54 +0000 (+0200)
Subject: gitk: Do not depend on Cygwin's "kill" command on Windows
X-Git-Tag: v2.2.0-rc0~5^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7b68b0eebf2148808f005b65569a76a83e3482bd

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 by 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: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index 3520bdaebc..bfc5cfabd3 100755
--- a/gitk
+++ b/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
 	}