Skip to content

Commit 8d859d9

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
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 dc16888 commit 8d859d9

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
@@ -3721,7 +3721,14 @@ static void adjust_symlink_flags(void)
37213721
symlink_file_flags |= 2;
37223722
symlink_directory_flags |= 2;
37233723
}
3724+
}
37243725

3726+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3727+
{
3728+
if (ctrl_type != CTRL_C_EVENT)
3729+
return FALSE; /* we did not handle this */
3730+
mingw_raise(SIGINT);
3731+
return TRUE; /* we did handle this */
37253732
}
37263733

37273734
#ifdef _MSC_VER
@@ -3757,6 +3764,8 @@ int wmain(int argc, const wchar_t **wargv)
37573764
#endif
37583765
#endif
37593766

3767+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3768+
37603769
maybe_redirect_std_handles();
37613770
adjust_symlink_flags();
37623771
fsync_object_files = 1;

0 commit comments

Comments
 (0)