Skip to content

Commit f1aa6eb

Browse files
dschomjcheetham
authored andcommitted
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 6f70a0c commit f1aa6eb

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
@@ -3808,7 +3808,14 @@ static void adjust_symlink_flags(void)
38083808
symlink_file_flags |= 2;
38093809
symlink_directory_flags |= 2;
38103810
}
3811+
}
38113812

3813+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3814+
{
3815+
if (ctrl_type != CTRL_C_EVENT)
3816+
return FALSE; /* we did not handle this */
3817+
mingw_raise(SIGINT);
3818+
return TRUE; /* we did handle this */
38123819
}
38133820

38143821
#ifdef _MSC_VER
@@ -3844,6 +3851,8 @@ int wmain(int argc, const wchar_t **wargv)
38443851
#endif
38453852
#endif
38463853

3854+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3855+
38473856
maybe_redirect_std_handles();
38483857
adjust_symlink_flags();
38493858
fsync_object_files = 1;

0 commit comments

Comments
 (0)