Skip to content

Commit 19df35e

Browse files
dschoGit for Windows Build Agent
authored andcommitted
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 210af87 commit 19df35e

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
@@ -2870,7 +2870,14 @@ static void adjust_symlink_flags(void)
28702870
symlink_file_flags |= 2;
28712871
symlink_directory_flags |= 2;
28722872
}
2873+
}
28732874

2875+
static BOOL WINAPI handle_ctrl_c(DWORD ctrl_type)
2876+
{
2877+
if (ctrl_type != CTRL_C_EVENT)
2878+
return FALSE; /* we did not handle this */
2879+
mingw_raise(SIGINT);
2880+
return TRUE; /* we did handle this */
28742881
}
28752882

28762883
#ifdef _MSC_VER
@@ -2904,6 +2911,8 @@ int wmain(int argc, const wchar_t **wargv)
29042911
#endif
29052912
#endif
29062913

2914+
SetConsoleCtrlHandler(handle_ctrl_c, TRUE);
2915+
29072916
maybe_redirect_std_handles();
29082917
adjust_symlink_flags();
29092918

0 commit comments

Comments
 (0)