Skip to content

Commit 05e092a

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 83b4ade commit 05e092a

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
@@ -4121,7 +4121,14 @@ static void adjust_symlink_flags(void)
41214121
symlink_file_flags |= 2;
41224122
symlink_directory_flags |= 2;
41234123
}
4124+
}
41244125

4126+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
4127+
{
4128+
if (ctrl_type != CTRL_C_EVENT)
4129+
return FALSE; /* we did not handle this */
4130+
mingw_raise(SIGINT);
4131+
return TRUE; /* we did handle this */
41254132
}
41264133

41274134
#ifdef _MSC_VER
@@ -4158,6 +4165,8 @@ int wmain(int argc, const wchar_t **wargv)
41584165
#endif
41594166
#endif
41604167

4168+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
4169+
41614170
maybe_redirect_std_handles();
41624171
adjust_symlink_flags();
41634172
fsync_object_files = 1;

0 commit comments

Comments
 (0)