Skip to content

Commit 7417b7f

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 7b19b7b commit 7417b7f

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
@@ -3787,7 +3787,14 @@ static void adjust_symlink_flags(void)
37873787
symlink_file_flags |= 2;
37883788
symlink_directory_flags |= 2;
37893789
}
3790+
}
37903791

3792+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3793+
{
3794+
if (ctrl_type != CTRL_C_EVENT)
3795+
return FALSE; /* we did not handle this */
3796+
mingw_raise(SIGINT);
3797+
return TRUE; /* we did handle this */
37913798
}
37923799

37933800
#ifdef _MSC_VER
@@ -3823,6 +3830,8 @@ int wmain(int argc, const wchar_t **wargv)
38233830
#endif
38243831
#endif
38253832

3833+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3834+
38263835
maybe_redirect_std_handles();
38273836
adjust_symlink_flags();
38283837
fsync_object_files = 1;

0 commit comments

Comments
 (0)