Skip to content

Commit 0177a1a

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 4e621f6 commit 0177a1a

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
@@ -3464,7 +3464,14 @@ static void adjust_symlink_flags(void)
34643464
symlink_file_flags |= 2;
34653465
symlink_directory_flags |= 2;
34663466
}
3467+
}
34673468

3469+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3470+
{
3471+
if (ctrl_type != CTRL_C_EVENT)
3472+
return FALSE; /* we did not handle this */
3473+
mingw_raise(SIGINT);
3474+
return TRUE; /* we did handle this */
34683475
}
34693476

34703477
#ifdef _MSC_VER
@@ -3500,6 +3507,8 @@ int wmain(int argc, const wchar_t **wargv)
35003507
#endif
35013508
#endif
35023509

3510+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3511+
35033512
maybe_redirect_std_handles();
35043513
adjust_symlink_flags();
35053514
fsync_object_files = 1;

0 commit comments

Comments
 (0)