Skip to content

Commit d575b4a

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 5c13a3d commit d575b4a

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
@@ -3573,7 +3573,14 @@ static void adjust_symlink_flags(void)
35733573
symlink_file_flags |= 2;
35743574
symlink_directory_flags |= 2;
35753575
}
3576+
}
35763577

3578+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3579+
{
3580+
if (ctrl_type != CTRL_C_EVENT)
3581+
return FALSE; /* we did not handle this */
3582+
mingw_raise(SIGINT);
3583+
return TRUE; /* we did handle this */
35773584
}
35783585

35793586
#ifdef _MSC_VER
@@ -3609,6 +3616,8 @@ int wmain(int argc, const wchar_t **wargv)
36093616
#endif
36103617
#endif
36113618

3619+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3620+
36123621
maybe_redirect_std_handles();
36133622
adjust_symlink_flags();
36143623
fsync_object_files = 1;

0 commit comments

Comments
 (0)