Skip to content

Commit 30a21dd

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 10e97ec commit 30a21dd

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
@@ -4069,7 +4069,14 @@ static void adjust_symlink_flags(void)
40694069
symlink_file_flags |= 2;
40704070
symlink_directory_flags |= 2;
40714071
}
4072+
}
40724073

4074+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
4075+
{
4076+
if (ctrl_type != CTRL_C_EVENT)
4077+
return FALSE; /* we did not handle this */
4078+
mingw_raise(SIGINT);
4079+
return TRUE; /* we did handle this */
40734080
}
40744081

40754082
#ifdef _MSC_VER
@@ -4106,6 +4113,8 @@ int wmain(int argc, const wchar_t **wargv)
41064113
#endif
41074114
#endif
41084115

4116+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
4117+
41094118
maybe_redirect_std_handles();
41104119
adjust_symlink_flags();
41114120
fsync_object_files = 1;

0 commit comments

Comments
 (0)