Skip to content

Commit

Permalink
gitk: Do not depend on Cygwin's "kill" command on Windows
Browse files Browse the repository at this point in the history
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 <sschuberth@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Sebastian Schuberth authored and Paul Mackerras committed Oct 29, 2014
1 parent 09898e7 commit 7b68b0e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gitk
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ proc stop_instance {inst} {
set pid [pid $fd]

if {$::tcl_platform(platform) eq {windows}} {
exec kill -f $pid
exec taskkill /pid $pid
} else {
exec kill $pid
}
Expand Down

0 comments on commit 7b68b0e

Please sign in to comment.