Skip to content

Commit 11cb040

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 cf3fe2e commit 11cb040

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
@@ -2877,7 +2877,14 @@ static void adjust_symlink_flags(void)
28772877
symlink_file_flags |= 2;
28782878
symlink_directory_flags |= 2;
28792879
}
2880+
}
28802881

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

28832890
#ifdef _MSC_VER
@@ -2911,6 +2918,8 @@ int wmain(int argc, const wchar_t **wargv)
29112918
#endif
29122919
#endif
29132920

2921+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
2922+
29142923
maybe_redirect_std_handles();
29152924
adjust_symlink_flags();
29162925
fsync_object_files = 1;

0 commit comments

Comments
 (0)