Skip to content

Commit 9bff3db

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 6090119 commit 9bff3db

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
@@ -2924,7 +2924,14 @@ static void adjust_symlink_flags(void)
29242924
symlink_file_flags |= 2;
29252925
symlink_directory_flags |= 2;
29262926
}
2927+
}
29272928

2929+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
2930+
{
2931+
if (ctrl_type != CTRL_C_EVENT)
2932+
return FALSE; /* we did not handle this */
2933+
mingw_raise(SIGINT);
2934+
return TRUE; /* we did handle this */
29282935
}
29292936

29302937
#ifdef _MSC_VER
@@ -2960,6 +2967,8 @@ int wmain(int argc, const wchar_t **wargv)
29602967
#endif
29612968
#endif
29622969

2970+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
2971+
29632972
maybe_redirect_std_handles();
29642973
adjust_symlink_flags();
29652974
fsync_object_files = 1;

0 commit comments

Comments
 (0)