Skip to content

Commit 4970a9b

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 c91d523 commit 4970a9b

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
@@ -3571,7 +3571,14 @@ static void adjust_symlink_flags(void)
35713571
symlink_file_flags |= 2;
35723572
symlink_directory_flags |= 2;
35733573
}
3574+
}
35743575

3576+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3577+
{
3578+
if (ctrl_type != CTRL_C_EVENT)
3579+
return FALSE; /* we did not handle this */
3580+
mingw_raise(SIGINT);
3581+
return TRUE; /* we did handle this */
35753582
}
35763583

35773584
#ifdef _MSC_VER
@@ -3607,6 +3614,8 @@ int wmain(int argc, const wchar_t **wargv)
36073614
#endif
36083615
#endif
36093616

3617+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3618+
36103619
maybe_redirect_std_handles();
36113620
adjust_symlink_flags();
36123621
fsync_object_files = 1;

0 commit comments

Comments
 (0)