Skip to content

Commit 4609497

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 23a4ad1 commit 4609497

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
@@ -2879,7 +2879,14 @@ static void adjust_symlink_flags(void)
28792879
symlink_file_flags |= 2;
28802880
symlink_directory_flags |= 2;
28812881
}
2882+
}
28822883

2884+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
2885+
{
2886+
if (ctrl_type != CTRL_C_EVENT)
2887+
return FALSE; /* we did not handle this */
2888+
mingw_raise(SIGINT);
2889+
return TRUE; /* we did handle this */
28832890
}
28842891

28852892
#ifdef _MSC_VER
@@ -2913,6 +2920,8 @@ int wmain(int argc, const wchar_t **wargv)
29132920
#endif
29142921
#endif
29152922

2923+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
2924+
29162925
maybe_redirect_std_handles();
29172926
adjust_symlink_flags();
29182927

0 commit comments

Comments
 (0)