global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-18 06:34:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

mingw: really handle SIGINT

Browse Source 
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 <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2018-04-23 00:24:29 +02:00
parent 133d6d86fc
commit 610865d72b
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compat/mingw.c
View File

@@ -3374,6 +3374,14 @@ static void adjust_symlink_flags(void)
}
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
{
if (ctrl_type != CTRL_C_EVENT)
return FALSE; /* we did not handle this */
mingw_raise(SIGINT);
return TRUE; /* we did handle this */
}
#if defined(_MSC_VER)
#ifdef _DEBUG
@@ -3412,6 +3420,8 @@ int msc_startup(int argc, wchar_t **w_argv, wchar_t **w_env)
_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
#endif
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
fsync_object_files = 1;
maybe_redirect_std_handles();
adjust_symlink_flags();
@@ -3480,6 +3490,8 @@ void mingw_startup(void)
wchar_t **wenv, **wargv;
_startupinfo si;
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
fsync_object_files = 1;
maybe_redirect_std_handles();
adjust_symlink_flags();