Skip to content

Commit 9d00d10

Browse files
sschuberthdscho
authored andcommitted
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 <[email protected]>
1 parent 1ead675 commit 9d00d10

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

git-gui/git-gui.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -666,9 +666,7 @@ proc kill_file_process {fd} {
666666
667667
catch {
668668
if {[is_Windows]} {
669-
# Use a Cygwin-specific flag to allow killing
670-
# native Windows processes
671-
exec kill -f $process
669+
exec taskkill /pid $process
672670
} else {
673671
exec kill $process
674672
}

0 commit comments

Comments
 (0)