Skip to content

Commit 154c75f

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 f97008a commit 154c75f

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
@@ -3575,7 +3575,14 @@ static void adjust_symlink_flags(void)
35753575
symlink_file_flags |= 2;
35763576
symlink_directory_flags |= 2;
35773577
}
3578+
}
35783579

3580+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3581+
{
3582+
if (ctrl_type != CTRL_C_EVENT)
3583+
return FALSE; /* we did not handle this */
3584+
mingw_raise(SIGINT);
3585+
return TRUE; /* we did handle this */
35793586
}
35803587

35813588
#ifdef _MSC_VER
@@ -3611,6 +3618,8 @@ int wmain(int argc, const wchar_t **wargv)
36113618
#endif
36123619
#endif
36133620

3621+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3622+
36143623
maybe_redirect_std_handles();
36153624
adjust_symlink_flags();
36163625
fsync_object_files = 1;

0 commit comments

Comments
 (0)