Skip to content

Commit 297cc92

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 <johannes.schindelin@gmx.de>
1 parent 8d6f164 commit 297cc92

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

compat/mingw.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3580,7 +3580,14 @@ static void adjust_symlink_flags(void)
35803580
symlink_file_flags |= 2;
35813581
symlink_directory_flags |= 2;
35823582
}
3583+
}
35833584

3585+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3586+
{
3587+
if (ctrl_type != CTRL_C_EVENT)
3588+
return FALSE; /* we did not handle this */
3589+
mingw_raise(SIGINT);
3590+
return TRUE; /* we did handle this */
35843591
}
35853592

35863593
#ifdef _MSC_VER
@@ -3617,6 +3624,8 @@ int wmain(int argc, const wchar_t **wargv)
36173624
#endif
36183625
#endif
36193626

3627+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3628+
36203629
maybe_redirect_std_handles();
36213630
adjust_symlink_flags();
36223631

0 commit comments

Comments
 (0)