Skip to content

Commit a861966

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 9980832 commit a861966

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
@@ -4028,7 +4028,14 @@ static void adjust_symlink_flags(void)
40284028
symlink_file_flags |= 2;
40294029
symlink_directory_flags |= 2;
40304030
}
4031+
}
40314032

4033+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
4034+
{
4035+
if (ctrl_type != CTRL_C_EVENT)
4036+
return FALSE; /* we did not handle this */
4037+
mingw_raise(SIGINT);
4038+
return TRUE; /* we did handle this */
40324039
}
40334040

40344041
#ifdef _MSC_VER
@@ -4065,6 +4072,8 @@ int wmain(int argc, const wchar_t **wargv)
40654072
#endif
40664073
#endif
40674074

4075+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
4076+
40684077
maybe_redirect_std_handles();
40694078
adjust_symlink_flags();
40704079
fsync_object_files = 1;

0 commit comments

Comments
 (0)