Skip to content

Commit e2a335d

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 8f2d0fe commit e2a335d

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
@@ -2893,7 +2893,14 @@ static void adjust_symlink_flags(void)
28932893
symlink_file_flags |= 2;
28942894
symlink_directory_flags |= 2;
28952895
}
2896+
}
28962897

2898+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
2899+
{
2900+
if (ctrl_type != CTRL_C_EVENT)
2901+
return FALSE; /* we did not handle this */
2902+
mingw_raise(SIGINT);
2903+
return TRUE; /* we did handle this */
28972904
}
28982905

28992906
#ifdef _MSC_VER
@@ -2929,6 +2936,8 @@ int wmain(int argc, const wchar_t **wargv)
29292936
#endif
29302937
#endif
29312938

2939+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
2940+
29322941
maybe_redirect_std_handles();
29332942
adjust_symlink_flags();
29342943
fsync_object_files = 1;

0 commit comments

Comments
 (0)