Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 8768113

Browse files
committed
Merge pull request #239 from sschuberth/taskkill
git-gui/gitk: Do not use a Cygwin-specific kill flag on Windows
2 parents be148fa + 23b4c7e commit 8768113

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

git-gui/git-gui.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -669,9 +669,7 @@ proc kill_file_process {fd} {
669669
670670
catch {
671671
if {[is_Windows]} {
672-
# Use a Cygwin-specific flag to allow killing
673-
# native Windows processes
674-
exec kill -f $process
672+
exec taskkill /pid $process
675673
} else {
676674
exec kill $process
677675
}

gitk-git/gitk

+1-1
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)