Skip to content

Commit dc48c28

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 de1cc89 commit dc48c28

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
@@ -3772,7 +3772,14 @@ static void adjust_symlink_flags(void)
37723772
symlink_file_flags |= 2;
37733773
symlink_directory_flags |= 2;
37743774
}
3775+
}
37753776

3777+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3778+
{
3779+
if (ctrl_type != CTRL_C_EVENT)
3780+
return FALSE; /* we did not handle this */
3781+
mingw_raise(SIGINT);
3782+
return TRUE; /* we did handle this */
37763783
}
37773784

37783785
#ifdef _MSC_VER
@@ -3808,6 +3815,8 @@ int wmain(int argc, const wchar_t **wargv)
38083815
#endif
38093816
#endif
38103817

3818+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3819+
38113820
maybe_redirect_std_handles();
38123821
adjust_symlink_flags();
38133822
fsync_object_files = 1;

0 commit comments

Comments
 (0)