Skip to content

Commit 2cf8cd6

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 157c3ed commit 2cf8cd6

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
@@ -3882,7 +3882,14 @@ static void adjust_symlink_flags(void)
38823882
symlink_file_flags |= 2;
38833883
symlink_directory_flags |= 2;
38843884
}
3885+
}
38853886

3887+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3888+
{
3889+
if (ctrl_type != CTRL_C_EVENT)
3890+
return FALSE; /* we did not handle this */
3891+
mingw_raise(SIGINT);
3892+
return TRUE; /* we did handle this */
38863893
}
38873894

38883895
#ifdef _MSC_VER
@@ -3918,6 +3925,8 @@ int wmain(int argc, const wchar_t **wargv)
39183925
#endif
39193926
#endif
39203927

3928+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3929+
39213930
maybe_redirect_std_handles();
39223931
adjust_symlink_flags();
39233932
fsync_object_files = 1;

0 commit comments

Comments
 (0)