Skip to content

Commit b408621

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 aa525ff commit b408621

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
@@ -4117,7 +4117,14 @@ static void adjust_symlink_flags(void)
41174117
symlink_file_flags |= 2;
41184118
symlink_directory_flags |= 2;
41194119
}
4120+
}
41204121

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

41234130
#ifdef _MSC_VER
@@ -4154,6 +4161,8 @@ int wmain(int argc, const wchar_t **wargv)
41544161
#endif
41554162
#endif
41564163

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

0 commit comments

Comments
 (0)