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 b523c98e4bda2167a5ea04773568db0c7f114c0b..d7fea265f3e48a32c11c208749d59f86a8f5bdda 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -388,7 +388,12 @@ proc stop_instance {inst} {
     set fd $commfd($inst)
     catch {
        set pid [pid $fd]
     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
     }
     catch {close $fd}
     nukefile $fd