Skip to content

Commit 38373d2

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 <[email protected]>
1 parent ce18e40 commit 38373d2

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
@@ -3813,7 +3813,14 @@ static void adjust_symlink_flags(void)
38133813
symlink_file_flags |= 2;
38143814
symlink_directory_flags |= 2;
38153815
}
3816+
}
38163817

3818+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3819+
{
3820+
if (ctrl_type != CTRL_C_EVENT)
3821+
return FALSE; /* we did not handle this */
3822+
mingw_raise(SIGINT);
3823+
return TRUE; /* we did handle this */
38173824
}
38183825

38193826
#ifdef _MSC_VER
@@ -3849,6 +3856,8 @@ int wmain(int argc, const wchar_t **wargv)
38493856
#endif
38503857
#endif
38513858

3859+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3860+
38523861
maybe_redirect_std_handles();
38533862
adjust_symlink_flags();
38543863
fsync_object_files = 1;

0 commit comments

Comments
 (0)