Skip to content

Commit 3e0e5dc

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 d43f2cd commit 3e0e5dc

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
@@ -4176,7 +4176,14 @@ static void adjust_symlink_flags(void)
41764176
symlink_file_flags |= 2;
41774177
symlink_directory_flags |= 2;
41784178
}
4179+
}
41794180

4181+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
4182+
{
4183+
if (ctrl_type != CTRL_C_EVENT)
4184+
return FALSE; /* we did not handle this */
4185+
mingw_raise(SIGINT);
4186+
return TRUE; /* we did handle this */
41804187
}
41814188

41824189
#ifdef _MSC_VER
@@ -4213,6 +4220,8 @@ int wmain(int argc, const wchar_t **wargv)
42134220
#endif
42144221
#endif
42154222

4223+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
4224+
42164225
maybe_redirect_std_handles();
42174226
adjust_symlink_flags();
42184227
fsync_object_files = 1;

0 commit comments

Comments
 (0)