summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Schuberth <sschuberth@gmail.com>2014-10-23 21:30:54 +0200
committerPaul Mackerras <paulus@samba.org>2014-10-30 09:43:11 +1100
commit7b68b0eebf2148808f005b65569a76a83e3482bd (patch)
tree982694665b86973924aa63a5044c73f40c53f300
parent09898e7c3b040086e8addd4ef226548c9dce1460 (diff)
downloadgit-7b68b0eebf2148808f005b65569a76a83e3482bd.tar.gz
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>
-rwxr-xr-xgitk2
1 files changed, 1 insertions, 1 deletions
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
}