Skip to content

Commit 2239445

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 fc916b4 commit 2239445

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
@@ -4102,7 +4102,14 @@ static void adjust_symlink_flags(void)
41024102
symlink_file_flags |= 2;
41034103
symlink_directory_flags |= 2;
41044104
}
4105+
}
41054106

4107+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
4108+
{
4109+
if (ctrl_type != CTRL_C_EVENT)
4110+
return FALSE; /* we did not handle this */
4111+
mingw_raise(SIGINT);
4112+
return TRUE; /* we did handle this */
41064113
}
41074114

41084115
#ifdef _MSC_VER
@@ -4139,6 +4146,8 @@ int wmain(int argc, const wchar_t **wargv)
41394146
#endif
41404147
#endif
41414148

4149+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
4150+
41424151
maybe_redirect_std_handles();
41434152
adjust_symlink_flags();
41444153
fsync_object_files = 1;

0 commit comments

Comments
 (0)