Skip to content

Commit

Permalink
git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sebastian Schuberth authored and Pat Thoyts committed Nov 6, 2014
1 parent a43c5f5 commit 3b422bc
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions git-gui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -670,9 +670,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
}
Expand Down

0 comments on commit 3b422bc

Please sign in to comment.