Skip to content

Commit 0eaad07

Browse files
committed
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 1ecb133 commit 0eaad07

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
@@ -4105,7 +4105,14 @@ static void adjust_symlink_flags(void)
41054105
symlink_file_flags |= 2;
41064106
symlink_directory_flags |= 2;
41074107
}
4108+
}
41084109

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

41114118
#ifdef _MSC_VER
@@ -4142,6 +4149,8 @@ int wmain(int argc, const wchar_t **wargv)
41424149
#endif
41434150
#endif
41444151

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

0 commit comments

Comments
 (0)