Skip to content

Commit e1916a1

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 90fea1e commit e1916a1

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
@@ -2894,7 +2894,14 @@ static void adjust_symlink_flags(void)
28942894
symlink_file_flags |= 2;
28952895
symlink_directory_flags |= 2;
28962896
}
2897+
}
28972898

2899+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
2900+
{
2901+
if (ctrl_type != CTRL_C_EVENT)
2902+
return FALSE; /* we did not handle this */
2903+
mingw_raise(SIGINT);
2904+
return TRUE; /* we did handle this */
28982905
}
28992906

29002907
#ifdef _MSC_VER
@@ -2930,6 +2937,8 @@ int wmain(int argc, const wchar_t **wargv)
29302937
#endif
29312938
#endif
29322939

2940+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
2941+
29332942
maybe_redirect_std_handles();
29342943
adjust_symlink_flags();
29352944
fsync_object_files = 1;

0 commit comments

Comments
 (0)