Skip to content

Commit aa59e23

Browse files
dschoGit for Windows Build Agent
authored andcommitted
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 <johannes.schindelin@gmx.de>
1 parent 8b907bd commit aa59e23

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

compat/mingw.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4106,7 +4106,14 @@ static void adjust_symlink_flags(void)
41064106
symlink_file_flags |= 2;
41074107
symlink_directory_flags |= 2;
41084108
}
4109+
}
41094110

4111+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
4112+
{
4113+
if (ctrl_type != CTRL_C_EVENT)
4114+
return FALSE; /* we did not handle this */
4115+
mingw_raise(SIGINT);
4116+
return TRUE; /* we did handle this */
41104117
}
41114118

41124119
#ifdef _MSC_VER
@@ -4143,6 +4150,8 @@ int wmain(int argc, const wchar_t **wargv)
41434150
#endif
41444151
#endif
41454152

4153+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
4154+
41464155
maybe_redirect_std_handles();
41474156
adjust_symlink_flags();
41484157
fsync_object_files = 1;

0 commit comments

Comments
 (0)