aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gavrilov <angavrilov@gmail.com>2008-07-15 00:35:42 +0400
committerPaul Mackerras <paulus@samba.org>2008-07-31 20:29:44 +1000
commitb6326e92ef39b37361002bffb1f94645339eec59 (patch)
tree869384644b8e273ef13389ef467759b19878c727
parente439e092b8ee5248e92ed4cb4400f9dbed70f689 (diff)
downloadgit-b6326e92ef39b37361002bffb1f94645339eec59.tar.gz
git-b6326e92ef39b37361002bffb1f94645339eec59.tar.xz
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>
-rwxr-xr-xgitk7
1 files changed, 6 insertions, 1 deletions
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