Skip to content

Commit 5519b4c

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 81fe282 commit 5519b4c

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
@@ -3799,7 +3799,14 @@ static void adjust_symlink_flags(void)
37993799
symlink_file_flags |= 2;
38003800
symlink_directory_flags |= 2;
38013801
}
3802+
}
38023803

3804+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3805+
{
3806+
if (ctrl_type != CTRL_C_EVENT)
3807+
return FALSE; /* we did not handle this */
3808+
mingw_raise(SIGINT);
3809+
return TRUE; /* we did handle this */
38033810
}
38043811

38053812
#ifdef _MSC_VER
@@ -3835,6 +3842,8 @@ int wmain(int argc, const wchar_t **wargv)
38353842
#endif
38363843
#endif
38373844

3845+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3846+
38383847
maybe_redirect_std_handles();
38393848
adjust_symlink_flags();
38403849
fsync_object_files = 1;

0 commit comments

Comments
 (0)