Skip to content

Commit 1d57dc9

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 21e8283 commit 1d57dc9

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
@@ -3046,7 +3046,14 @@ static void adjust_symlink_flags(void)
30463046
symlink_file_flags |= 2;
30473047
symlink_directory_flags |= 2;
30483048
}
3049+
}
30493050

3051+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3052+
{
3053+
if (ctrl_type != CTRL_C_EVENT)
3054+
return FALSE; /* we did not handle this */
3055+
mingw_raise(SIGINT);
3056+
return TRUE; /* we did handle this */
30503057
}
30513058

30523059
#ifdef _MSC_VER
@@ -3082,6 +3089,8 @@ int wmain(int argc, const wchar_t **wargv)
30823089
#endif
30833090
#endif
30843091

3092+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3093+
30853094
maybe_redirect_std_handles();
30863095
adjust_symlink_flags();
30873096
fsync_object_files = 1;

0 commit comments

Comments
 (0)