Skip to content

Commit 0a8b6cc

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 894838c commit 0a8b6cc

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
@@ -3886,7 +3886,14 @@ static void adjust_symlink_flags(void)
38863886
symlink_file_flags |= 2;
38873887
symlink_directory_flags |= 2;
38883888
}
3889+
}
38893890

3891+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3892+
{
3893+
if (ctrl_type != CTRL_C_EVENT)
3894+
return FALSE; /* we did not handle this */
3895+
mingw_raise(SIGINT);
3896+
return TRUE; /* we did handle this */
38903897
}
38913898

38923899
#ifdef _MSC_VER
@@ -3923,6 +3930,8 @@ int wmain(int argc, const wchar_t **wargv)
39233930
#endif
39243931
#endif
39253932

3933+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3934+
39263935
maybe_redirect_std_handles();
39273936
adjust_symlink_flags();
39283937
fsync_object_files = 1;

0 commit comments

Comments
 (0)