Skip to content

Commit d131bb2

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 2b379aa commit d131bb2

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
@@ -3345,7 +3345,14 @@ static void adjust_symlink_flags(void)
33453345
symlink_file_flags |= 2;
33463346
symlink_directory_flags |= 2;
33473347
}
3348+
}
33483349

3350+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3351+
{
3352+
if (ctrl_type != CTRL_C_EVENT)
3353+
return FALSE; /* we did not handle this */
3354+
mingw_raise(SIGINT);
3355+
return TRUE; /* we did handle this */
33493356
}
33503357

33513358
#ifdef _MSC_VER
@@ -3381,6 +3388,8 @@ int wmain(int argc, const wchar_t **wargv)
33813388
#endif
33823389
#endif
33833390

3391+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3392+
33843393
maybe_redirect_std_handles();
33853394
adjust_symlink_flags();
33863395
fsync_object_files = 1;

0 commit comments

Comments
 (0)