Skip to content

Commit 64b0171

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 0adaeae commit 64b0171

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
@@ -4029,7 +4029,14 @@ static void adjust_symlink_flags(void)
40294029
symlink_file_flags |= 2;
40304030
symlink_directory_flags |= 2;
40314031
}
4032+
}
40324033

4034+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
4035+
{
4036+
if (ctrl_type != CTRL_C_EVENT)
4037+
return FALSE; /* we did not handle this */
4038+
mingw_raise(SIGINT);
4039+
return TRUE; /* we did handle this */
40334040
}
40344041

40354042
#ifdef _MSC_VER
@@ -4066,6 +4073,8 @@ int wmain(int argc, const wchar_t **wargv)
40664073
#endif
40674074
#endif
40684075

4076+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
4077+
40694078
maybe_redirect_std_handles();
40704079
adjust_symlink_flags();
40714080
fsync_object_files = 1;

0 commit comments

Comments
 (0)