Skip to content

Commit bb03d97

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 19de391 commit bb03d97

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
@@ -3876,7 +3876,14 @@ static void adjust_symlink_flags(void)
38763876
symlink_file_flags |= 2;
38773877
symlink_directory_flags |= 2;
38783878
}
3879+
}
38793880

3881+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3882+
{
3883+
if (ctrl_type != CTRL_C_EVENT)
3884+
return FALSE; /* we did not handle this */
3885+
mingw_raise(SIGINT);
3886+
return TRUE; /* we did handle this */
38803887
}
38813888

38823889
#ifdef _MSC_VER
@@ -3912,6 +3919,8 @@ int wmain(int argc, const wchar_t **wargv)
39123919
#endif
39133920
#endif
39143921

3922+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3923+
39153924
maybe_redirect_std_handles();
39163925
adjust_symlink_flags();
39173926
fsync_object_files = 1;

0 commit comments

Comments
 (0)