Commit 2f017ac
committed
Avoid making it look like kill_process works on Windows
This changes the code in Git.execute's local kill_process function,
which it uses as the timed callback for kill_after_timeout, to
remove code that is unnecessary because kill_process doesn't
support Windows, and to avoid giving the false impression that its
code could be used unmodified on Windows without serious problems.
- Raise AssertionError explicitly if it is called on Windows. This
is done with "raise" rather than "assert" so its behavior doesn't
vary depending on "-O".
- Don't pass process creation flags, because they were 0 except on
Windows.
- Don't fall back to SIGTERM if Python's signal module doesn't know
about SIGKILL. This was specifically for Windows which has no
SIGKILL.
See #1756 for discussion.1 parent f42a63b commit 2f017ac
1 file changed
+7
-11
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1015 | 1015 | | |
1016 | 1016 | | |
1017 | 1017 | | |
1018 | | - | |
1019 | | - | |
1020 | | - | |
1021 | | - | |
1022 | | - | |
| 1018 | + | |
| 1019 | + | |
| 1020 | + | |
1023 | 1021 | | |
1024 | 1022 | | |
1025 | 1023 | | |
| |||
1028 | 1026 | | |
1029 | 1027 | | |
1030 | 1028 | | |
1031 | | - | |
1032 | | - | |
1033 | | - | |
| 1029 | + | |
1034 | 1030 | | |
1035 | 1031 | | |
1036 | | - | |
| 1032 | + | |
1037 | 1033 | | |
1038 | 1034 | | |
1039 | 1035 | | |
1040 | 1036 | | |
1041 | | - | |
1042 | | - | |
| 1037 | + | |
| 1038 | + | |
1043 | 1039 | | |
1044 | 1040 | | |
1045 | 1041 | | |
| |||
0 commit comments