Skip to content

Commit be5554d

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 9791d4c commit be5554d

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
@@ -3666,7 +3666,14 @@ static void adjust_symlink_flags(void)
36663666
symlink_file_flags |= 2;
36673667
symlink_directory_flags |= 2;
36683668
}
3669+
}
36693670

3671+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3672+
{
3673+
if (ctrl_type != CTRL_C_EVENT)
3674+
return FALSE; /* we did not handle this */
3675+
mingw_raise(SIGINT);
3676+
return TRUE; /* we did handle this */
36703677
}
36713678

36723679
#ifdef _MSC_VER
@@ -3702,6 +3709,8 @@ int wmain(int argc, const wchar_t **wargv)
37023709
#endif
37033710
#endif
37043711

3712+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3713+
37053714
maybe_redirect_std_handles();
37063715
adjust_symlink_flags();
37073716
fsync_object_files = 1;

0 commit comments

Comments
 (0)