Skip to content

Commit 61710c8

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 f135bb7 commit 61710c8

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
@@ -4116,7 +4116,14 @@ static void adjust_symlink_flags(void)
41164116
symlink_file_flags |= 2;
41174117
symlink_directory_flags |= 2;
41184118
}
4119+
}
41194120

4121+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
4122+
{
4123+
if (ctrl_type != CTRL_C_EVENT)
4124+
return FALSE; /* we did not handle this */
4125+
mingw_raise(SIGINT);
4126+
return TRUE; /* we did handle this */
41204127
}
41214128

41224129
#ifdef _MSC_VER
@@ -4153,6 +4160,8 @@ int wmain(int argc, const wchar_t **wargv)
41534160
#endif
41544161
#endif
41554162

4163+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
4164+
41564165
maybe_redirect_std_handles();
41574166
adjust_symlink_flags();
41584167
fsync_object_files = 1;

0 commit comments

Comments
 (0)