From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Mon, 14 Jul 2008 20:35:42 +0000 (+0400)
Subject: gitk: On Windows, use a Cygwin-specific flag for kill
X-Git-Tag: v1.6.0-rc2~4^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6326e92ef39b37361002bffb1f94645339eec59;p=git.git

gitk: On Windows, use a Cygwin-specific flag for kill

MSysGit compiles git binaries as native Windows executables,
so they cannot be killed unless a special flag is specified.

This flag is implemented by the Cygwin version of kill,
which is also included in MSysGit.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index b523c98e4..d7fea265f 100755
--- a/gitk
+++ b/gitk
@@ -388,7 +388,12 @@ proc stop_instance {inst} {
     set fd $commfd($inst)
     catch {
 	set pid [pid $fd]
-	exec kill $pid
+
+	if {$::tcl_platform(platform) eq {windows}} {
+	    exec kill -f $pid
+	} else {
+	    exec kill $pid
+	}
     }
     catch {close $fd}
     nukefile $fd