Skip to content

Commit 7b68b0e

Browse files
sschuberthpaulusmack
authored andcommitted
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 <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
1 parent 09898e7 commit 7b68b0e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

gitk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ proc stop_instance {inst} {
445445
set pid [pid $fd]
446446

447447
if {$::tcl_platform(platform) eq {windows}} {
448-
exec kill -f $pid
448+
exec taskkill /pid $pid
449449
} else {
450450
exec kill $pid
451451
}

0 commit comments

Comments
 (0)