mirror of
https://github.com/git/git.git
synced 2026-02-07 16:27:02 +00:00
Merge pull request #239 from sschuberth/taskkill
git-gui/gitk: Do not use a Cygwin-specific kill flag on Windows
This commit is contained in:
@@ -669,9 +669,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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user