Skip to content

Commit b292f98

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 d464ca6 commit b292f98

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
@@ -3349,7 +3349,14 @@ static void adjust_symlink_flags(void)
33493349
symlink_file_flags |= 2;
33503350
symlink_directory_flags |= 2;
33513351
}
3352+
}
33523353

3354+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3355+
{
3356+
if (ctrl_type != CTRL_C_EVENT)
3357+
return FALSE; /* we did not handle this */
3358+
mingw_raise(SIGINT);
3359+
return TRUE; /* we did handle this */
33533360
}
33543361

33553362
#ifdef _MSC_VER
@@ -3385,6 +3392,8 @@ int wmain(int argc, const wchar_t **wargv)
33853392
#endif
33863393
#endif
33873394

3395+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3396+
33883397
maybe_redirect_std_handles();
33893398
adjust_symlink_flags();
33903399
fsync_object_files = 1;

0 commit comments

Comments
 (0)