Skip to content

Commit 3b422bc

Browse files
sschuberthpatthoyts
authored andcommitted
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 <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
1 parent a43c5f5 commit 3b422bc

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

git-gui.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -670,9 +670,7 @@ proc kill_file_process {fd} {
670670
671671
catch {
672672
if {[is_Windows]} {
673-
# Use a Cygwin-specific flag to allow killing
674-
# native Windows processes
675-
exec kill -f $process
673+
exec taskkill /pid $process
676674
} else {
677675
exec kill $process
678676
}

0 commit comments

Comments
 (0)