Skip to content

Commit 0bd665b

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 3f43733 commit 0bd665b

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
@@ -3546,7 +3546,14 @@ static void adjust_symlink_flags(void)
35463546
symlink_file_flags |= 2;
35473547
symlink_directory_flags |= 2;
35483548
}
3549+
}
35493550

3551+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3552+
{
3553+
if (ctrl_type != CTRL_C_EVENT)
3554+
return FALSE; /* we did not handle this */
3555+
mingw_raise(SIGINT);
3556+
return TRUE; /* we did handle this */
35503557
}
35513558

35523559
#ifdef _MSC_VER
@@ -3582,6 +3589,8 @@ int wmain(int argc, const wchar_t **wargv)
35823589
#endif
35833590
#endif
35843591

3592+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3593+
35853594
maybe_redirect_std_handles();
35863595
adjust_symlink_flags();
35873596
fsync_object_files = 1;

0 commit comments

Comments
 (0)