Skip to content

Commit 1fff5c3

Browse files
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 6267ced commit 1fff5c3

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
@@ -2897,7 +2897,14 @@ static void adjust_symlink_flags(void)
28972897
symlink_file_flags |= 2;
28982898
symlink_directory_flags |= 2;
28992899
}
2900+
}
29002901

2902+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
2903+
{
2904+
if (ctrl_type != CTRL_C_EVENT)
2905+
return FALSE; /* we did not handle this */
2906+
mingw_raise(SIGINT);
2907+
return TRUE; /* we did handle this */
29012908
}
29022909

29032910
#ifdef _MSC_VER
@@ -2931,6 +2938,8 @@ int wmain(int argc, const wchar_t **wargv)
29312938
#endif
29322939
#endif
29332940

2941+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
2942+
29342943
maybe_redirect_std_handles();
29352944
adjust_symlink_flags();
29362945

0 commit comments

Comments
 (0)