Skip to content

Commit 57d30df

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 50faf98 commit 57d30df

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
@@ -2886,7 +2886,14 @@ static void adjust_symlink_flags(void)
28862886
symlink_file_flags |= 2;
28872887
symlink_directory_flags |= 2;
28882888
}
2889+
}
28892890

2891+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
2892+
{
2893+
if (ctrl_type != CTRL_C_EVENT)
2894+
return FALSE; /* we did not handle this */
2895+
mingw_raise(SIGINT);
2896+
return TRUE; /* we did handle this */
28902897
}
28912898

28922899
#ifdef _MSC_VER
@@ -2922,6 +2929,8 @@ int wmain(int argc, const wchar_t **wargv)
29222929
#endif
29232930
#endif
29242931

2932+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
2933+
29252934
maybe_redirect_std_handles();
29262935
adjust_symlink_flags();
29272936
fsync_object_files = 1;

0 commit comments

Comments
 (0)