Skip to content

Commit b6326e9

Browse files
angavrilovpaulusmack
authored andcommitted
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 <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
1 parent e439e09 commit b6326e9

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

gitk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,12 @@ proc stop_instance {inst} {
388388
set fd $commfd($inst)
389389
catch {
390390
set pid [pid $fd]
391-
exec kill $pid
391+
392+
if {$::tcl_platform(platform) eq {windows}} {
393+
exec kill -f $pid
394+
} else {
395+
exec kill $pid
396+
}
392397
}
393398
catch {close $fd}
394399
nukefile $fd

0 commit comments

Comments
 (0)