Skip to content

Commit 8727b49

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 db7aa33 commit 8727b49

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
@@ -3042,7 +3042,14 @@ static void adjust_symlink_flags(void)
30423042
symlink_file_flags |= 2;
30433043
symlink_directory_flags |= 2;
30443044
}
3045+
}
30453046

3047+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3048+
{
3049+
if (ctrl_type != CTRL_C_EVENT)
3050+
return FALSE; /* we did not handle this */
3051+
mingw_raise(SIGINT);
3052+
return TRUE; /* we did handle this */
30463053
}
30473054

30483055
#ifdef _MSC_VER
@@ -3078,6 +3085,8 @@ int wmain(int argc, const wchar_t **wargv)
30783085
#endif
30793086
#endif
30803087

3088+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3089+
30813090
maybe_redirect_std_handles();
30823091
adjust_symlink_flags();
30833092
fsync_object_files = 1;

0 commit comments

Comments
 (0)