Skip to content

Commit 3959306

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 <johannes.schindelin@gmx.de>
1 parent c603bf2 commit 3959306

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

compat/mingw.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4096,7 +4096,14 @@ static void adjust_symlink_flags(void)
40964096
symlink_file_flags |= 2;
40974097
symlink_directory_flags |= 2;
40984098
}
4099+
}
40994100

4101+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
4102+
{
4103+
if (ctrl_type != CTRL_C_EVENT)
4104+
return FALSE; /* we did not handle this */
4105+
mingw_raise(SIGINT);
4106+
return TRUE; /* we did handle this */
41004107
}
41014108

41024109
#ifdef _MSC_VER
@@ -4133,6 +4140,8 @@ int wmain(int argc, const wchar_t **wargv)
41334140
#endif
41344141
#endif
41354142

4143+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
4144+
41364145
maybe_redirect_std_handles();
41374146
adjust_symlink_flags();
41384147
fsync_object_files = 1;

0 commit comments

Comments
 (0)