Skip to content

Commit 6ffae3b

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 98c1d94 commit 6ffae3b

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

compat/mingw.c

+9
Original file line numberDiff line numberDiff line change
@@ -4110,7 +4110,14 @@ static void adjust_symlink_flags(void)
41104110
symlink_file_flags |= 2;
41114111
symlink_directory_flags |= 2;
41124112
}
4113+
}
41134114

4115+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
4116+
{
4117+
if (ctrl_type != CTRL_C_EVENT)
4118+
return FALSE; /* we did not handle this */
4119+
mingw_raise(SIGINT);
4120+
return TRUE; /* we did handle this */
41144121
}
41154122

41164123
#ifdef _MSC_VER
@@ -4147,6 +4154,8 @@ int wmain(int argc, const wchar_t **wargv)
41474154
#endif
41484155
#endif
41494156

4157+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
4158+
41504159
maybe_redirect_std_handles();
41514160
adjust_symlink_flags();
41524161
fsync_object_files = 1;

0 commit comments

Comments
 (0)