Skip to content

Commit c4c2870

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 2916f54 commit c4c2870

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
@@ -2922,7 +2922,14 @@ static void adjust_symlink_flags(void)
29222922
symlink_file_flags |= 2;
29232923
symlink_directory_flags |= 2;
29242924
}
2925+
}
29252926

2927+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
2928+
{
2929+
if (ctrl_type != CTRL_C_EVENT)
2930+
return FALSE; /* we did not handle this */
2931+
mingw_raise(SIGINT);
2932+
return TRUE; /* we did handle this */
29262933
}
29272934

29282935
#ifdef _MSC_VER
@@ -2958,6 +2965,8 @@ int wmain(int argc, const wchar_t **wargv)
29582965
#endif
29592966
#endif
29602967

2968+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
2969+
29612970
maybe_redirect_std_handles();
29622971
adjust_symlink_flags();
29632972
fsync_object_files = 1;

0 commit comments

Comments
 (0)