Skip to content

Commit e96d183

Browse files
dschoGit for Windows Build Agent
authored andcommitted
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 5aafd1d commit e96d183

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
@@ -4133,7 +4133,14 @@ static void adjust_symlink_flags(void)
41334133
symlink_file_flags |= 2;
41344134
symlink_directory_flags |= 2;
41354135
}
4136+
}
41364137

4138+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
4139+
{
4140+
if (ctrl_type != CTRL_C_EVENT)
4141+
return FALSE; /* we did not handle this */
4142+
mingw_raise(SIGINT);
4143+
return TRUE; /* we did handle this */
41374144
}
41384145

41394146
#ifdef _MSC_VER
@@ -4170,6 +4177,8 @@ int wmain(int argc, const wchar_t **wargv)
41704177
#endif
41714178
#endif
41724179

4180+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
4181+
41734182
maybe_redirect_std_handles();
41744183
adjust_symlink_flags();
41754184
fsync_object_files = 1;

0 commit comments

Comments
 (0)