mirror of
https://github.com/git/git.git
synced 2026-02-07 00:05:02 +00:00
git-gui/gitk: Do not use a Cygwin-specific kill flag 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 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>
This commit is contained in:
committed by
Johannes Schindelin
parent
a7f17aa223
commit
218f9b1549
@@ -666,9 +666,7 @@ proc kill_file_process {fd} {
|
||||
|
||||
catch {
|
||||
if {[is_Windows]} {
|
||||
# Use a Cygwin-specific flag to allow killing
|
||||
# native Windows processes
|
||||
exec kill -f $process
|
||||
exec taskkill /pid $process
|
||||
} else {
|
||||
exec kill $process
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user