mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
mingw: make stderr unbuffered again
When removing the hack for isatty(), we actually removed more than just an isatty() hack: we removed the hack where internal data structures of the MSVC runtime are modified in order to redirect stdout/stderr. Instead of using that hack (that does not work with newer versions of the runtime, anyway), we replaced it by reopening the respective file descriptors. What we forgot was to mark stderr as unbuffered again. Reported by Hannes Sixt. Fixed with Jeff Hostetler's assistance. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Tested-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
1d3f065e0e
commit
a4d92d579f
|
@ -510,6 +510,8 @@ static HANDLE swap_osfhnd(int fd, HANDLE new_handle)
|
|||
*/
|
||||
close(new_fd);
|
||||
|
||||
if (fd == 2)
|
||||
setvbuf(stderr, NULL, _IONBF, BUFSIZ);
|
||||
fd_is_interactive[fd] |= FD_SWAPPED;
|
||||
|
||||
return duplicate;
|
||||
|
@ -547,6 +549,8 @@ static void detect_msys_tty(int fd)
|
|||
!wcsstr(name, L"-pty"))
|
||||
return;
|
||||
|
||||
if (fd == 2)
|
||||
setvbuf(stderr, NULL, _IONBF, BUFSIZ);
|
||||
fd_is_interactive[fd] |= FD_MSYS;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue