Skip to content

Commit f4179bb

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 e0eee13 commit f4179bb

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
@@ -3550,7 +3550,14 @@ static void adjust_symlink_flags(void)
35503550
symlink_file_flags |= 2;
35513551
symlink_directory_flags |= 2;
35523552
}
3553+
}
35533554

3555+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3556+
{
3557+
if (ctrl_type != CTRL_C_EVENT)
3558+
return FALSE; /* we did not handle this */
3559+
mingw_raise(SIGINT);
3560+
return TRUE; /* we did handle this */
35543561
}
35553562

35563563
#ifdef _MSC_VER
@@ -3586,6 +3593,8 @@ int wmain(int argc, const wchar_t **wargv)
35863593
#endif
35873594
#endif
35883595

3596+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3597+
35893598
maybe_redirect_std_handles();
35903599
adjust_symlink_flags();
35913600
fsync_object_files = 1;

0 commit comments

Comments
 (0)