Skip to content

Commit 693345d

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 df1a4c7 commit 693345d

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
@@ -3820,7 +3820,14 @@ static void adjust_symlink_flags(void)
38203820
symlink_file_flags |= 2;
38213821
symlink_directory_flags |= 2;
38223822
}
3823+
}
38233824

3825+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3826+
{
3827+
if (ctrl_type != CTRL_C_EVENT)
3828+
return FALSE; /* we did not handle this */
3829+
mingw_raise(SIGINT);
3830+
return TRUE; /* we did handle this */
38243831
}
38253832

38263833
#ifdef _MSC_VER
@@ -3856,6 +3863,8 @@ int wmain(int argc, const wchar_t **wargv)
38563863
#endif
38573864
#endif
38583865

3866+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3867+
38593868
maybe_redirect_std_handles();
38603869
adjust_symlink_flags();
38613870
fsync_object_files = 1;

0 commit comments

Comments
 (0)