Skip to content

Commit b7b5f50

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 3761c2d commit b7b5f50

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
@@ -4061,7 +4061,14 @@ static void adjust_symlink_flags(void)
40614061
symlink_file_flags |= 2;
40624062
symlink_directory_flags |= 2;
40634063
}
4064+
}
40644065

4066+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
4067+
{
4068+
if (ctrl_type != CTRL_C_EVENT)
4069+
return FALSE; /* we did not handle this */
4070+
mingw_raise(SIGINT);
4071+
return TRUE; /* we did handle this */
40654072
}
40664073

40674074
#ifdef _MSC_VER
@@ -4098,6 +4105,8 @@ int wmain(int argc, const wchar_t **wargv)
40984105
#endif
40994106
#endif
41004107

4108+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
4109+
41014110
maybe_redirect_std_handles();
41024111
adjust_symlink_flags();
41034112
fsync_object_files = 1;

0 commit comments

Comments
 (0)