Skip to content

Commit 034eb03

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 19430b7 commit 034eb03

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
@@ -3880,7 +3880,14 @@ static void adjust_symlink_flags(void)
38803880
symlink_file_flags |= 2;
38813881
symlink_directory_flags |= 2;
38823882
}
3883+
}
38833884

3885+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3886+
{
3887+
if (ctrl_type != CTRL_C_EVENT)
3888+
return FALSE; /* we did not handle this */
3889+
mingw_raise(SIGINT);
3890+
return TRUE; /* we did handle this */
38843891
}
38853892

38863893
#ifdef _MSC_VER
@@ -3916,6 +3923,8 @@ int wmain(int argc, const wchar_t **wargv)
39163923
#endif
39173924
#endif
39183925

3926+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3927+
39193928
maybe_redirect_std_handles();
39203929
adjust_symlink_flags();
39213930
fsync_object_files = 1;

0 commit comments

Comments
 (0)