Skip to content

Commit 98ef233

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 d56d963 commit 98ef233

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
@@ -3262,7 +3262,14 @@ static void adjust_symlink_flags(void)
32623262
symlink_file_flags |= 2;
32633263
symlink_directory_flags |= 2;
32643264
}
3265+
}
32653266

3267+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
3268+
{
3269+
if (ctrl_type != CTRL_C_EVENT)
3270+
return FALSE; /* we did not handle this */
3271+
mingw_raise(SIGINT);
3272+
return TRUE; /* we did handle this */
32663273
}
32673274

32683275
#ifdef _MSC_VER
@@ -3298,6 +3305,8 @@ int wmain(int argc, const wchar_t **wargv)
32983305
#endif
32993306
#endif
33003307

3308+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
3309+
33013310
maybe_redirect_std_handles();
33023311
adjust_symlink_flags();
33033312
fsync_object_files = 1;

0 commit comments

Comments
 (0)