Skip to content

Commit b86761b

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 <[email protected]>
1 parent acd6f39 commit b86761b

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
@@ -3344,7 +3344,14 @@ static void adjust_symlink_flags(void)
33443344
symlink_file_flags |= 2;
33453345
symlink_directory_flags |= 2;
33463346
}
3347+
}
33473348

3349+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3350+
{
3351+
if (ctrl_type != CTRL_C_EVENT)
3352+
return FALSE; /* we did not handle this */
3353+
mingw_raise(SIGINT);
3354+
return TRUE; /* we did handle this */
33483355
}
33493356

33503357
#ifdef _MSC_VER
@@ -3380,6 +3387,8 @@ int wmain(int argc, const wchar_t **wargv)
33803387
#endif
33813388
#endif
33823389

3390+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3391+
33833392
maybe_redirect_std_handles();
33843393
adjust_symlink_flags();
33853394
fsync_object_files = 1;

0 commit comments

Comments
 (0)