Skip to content

Commit 49604ce

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 a7d82d9 commit 49604ce

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
@@ -3803,7 +3803,14 @@ static void adjust_symlink_flags(void)
38033803
symlink_file_flags |= 2;
38043804
symlink_directory_flags |= 2;
38053805
}
3806+
}
38063807

3808+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3809+
{
3810+
if (ctrl_type != CTRL_C_EVENT)
3811+
return FALSE; /* we did not handle this */
3812+
mingw_raise(SIGINT);
3813+
return TRUE; /* we did handle this */
38073814
}
38083815

38093816
#ifdef _MSC_VER
@@ -3839,6 +3846,8 @@ int wmain(int argc, const wchar_t **wargv)
38393846
#endif
38403847
#endif
38413848

3849+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3850+
38423851
maybe_redirect_std_handles();
38433852
adjust_symlink_flags();
38443853
fsync_object_files = 1;

0 commit comments

Comments
 (0)