Skip to content

Commit 2bb2e81

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 3ea8254 commit 2bb2e81

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
@@ -3478,7 +3478,14 @@ static void adjust_symlink_flags(void)
34783478
symlink_file_flags |= 2;
34793479
symlink_directory_flags |= 2;
34803480
}
3481+
}
34813482

3483+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3484+
{
3485+
if (ctrl_type != CTRL_C_EVENT)
3486+
return FALSE; /* we did not handle this */
3487+
mingw_raise(SIGINT);
3488+
return TRUE; /* we did handle this */
34823489
}
34833490

34843491
#ifdef _MSC_VER
@@ -3514,6 +3521,8 @@ int wmain(int argc, const wchar_t **wargv)
35143521
#endif
35153522
#endif
35163523

3524+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3525+
35173526
maybe_redirect_std_handles();
35183527
adjust_symlink_flags();
35193528
fsync_object_files = 1;

0 commit comments

Comments
 (0)