Skip to content

Commit 03d6833

Browse files
dschovdye
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 d39046e commit 03d6833

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
@@ -3681,7 +3681,14 @@ static void adjust_symlink_flags(void)
36813681
symlink_file_flags |= 2;
36823682
symlink_directory_flags |= 2;
36833683
}
3684+
}
36843685

3686+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3687+
{
3688+
if (ctrl_type != CTRL_C_EVENT)
3689+
return FALSE; /* we did not handle this */
3690+
mingw_raise(SIGINT);
3691+
return TRUE; /* we did handle this */
36853692
}
36863693

36873694
#ifdef _MSC_VER
@@ -3717,6 +3724,8 @@ int wmain(int argc, const wchar_t **wargv)
37173724
#endif
37183725
#endif
37193726

3727+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3728+
37203729
maybe_redirect_std_handles();
37213730
adjust_symlink_flags();
37223731
fsync_object_files = 1;

0 commit comments

Comments
 (0)