Skip to content

Commit 4047963

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 1766d29 commit 4047963

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

compat/mingw.c

+9
Original file line numberDiff line numberDiff line change
@@ -3790,7 +3790,14 @@ static void adjust_symlink_flags(void)
37903790
symlink_file_flags |= 2;
37913791
symlink_directory_flags |= 2;
37923792
}
3793+
}
37933794

3795+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3796+
{
3797+
if (ctrl_type != CTRL_C_EVENT)
3798+
return FALSE; /* we did not handle this */
3799+
mingw_raise(SIGINT);
3800+
return TRUE; /* we did handle this */
37943801
}
37953802

37963803
#ifdef _MSC_VER
@@ -3826,6 +3833,8 @@ int wmain(int argc, const wchar_t **wargv)
38263833
#endif
38273834
#endif
38283835

3836+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3837+
38293838
maybe_redirect_std_handles();
38303839
adjust_symlink_flags();
38313840
fsync_object_files = 1;

0 commit comments

Comments
 (0)