git-gui/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 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: Pat Thoyts <patthoyts@users.sourceforge.net>
This commit is contained in:

committed by
Pat Thoyts

parent
a43c5f51a4
commit
3b422bc854
@ -670,9 +670,7 @@ proc kill_file_process {fd} {
|
|||||||
|
|
||||||
catch {
|
catch {
|
||||||
if {[is_Windows]} {
|
if {[is_Windows]} {
|
||||||
# Use a Cygwin-specific flag to allow killing
|
exec taskkill /pid $process
|
||||||
# native Windows processes
|
|
||||||
exec kill -f $process
|
|
||||||
} else {
|
} else {
|
||||||
exec kill $process
|
exec kill $process
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user