Skip to content

Commit cfd1e40

Browse files
committed
mingw: really handle SIGINT
Previously, we did not install any handler for Ctrl+C, but now we really want to because the MSYS2 runtime learned the trick to call the ConsoleCtrlHandler when Ctrl+C was pressed. With this, hitting Ctrl+C while `git log` is running will only terminate the Git process, but not the pager. This finally matches the behavior on Linux and on macOS. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 47242f6 commit cfd1e40

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

compat/mingw.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2929,7 +2929,14 @@ static void adjust_symlink_flags(void)
29292929
symlink_file_flags |= 2;
29302930
symlink_directory_flags |= 2;
29312931
}
2932+
}
29322933

2934+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
2935+
{
2936+
if (ctrl_type != CTRL_C_EVENT)
2937+
return FALSE; /* we did not handle this */
2938+
mingw_raise(SIGINT);
2939+
return TRUE; /* we did handle this */
29332940
}
29342941

29352942
#ifdef _MSC_VER
@@ -2965,6 +2972,8 @@ int wmain(int argc, const wchar_t **wargv)
29652972
#endif
29662973
#endif
29672974

2975+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
2976+
29682977
maybe_redirect_std_handles();
29692978
adjust_symlink_flags();
29702979
fsync_object_files = 1;

0 commit comments

Comments
 (0)