mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/mingw-isatty'

Browse Source 
A hotfix for a topic already in 'master'.

* js/mingw-isatty:
  mingw: make stderr unbuffered again
This commit is contained in:
Junio C Hamano
2017-02-16 14:45:13 -08:00
parent 1e00c41fd6 a4d92d579f
commit e048a257bf
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compat/winansi.c
View File

@ -510,6 +510,8 @@ static HANDLE swap_osfhnd(int fd, HANDLE new_handle)
*/ */
close(new_fd); close(new_fd);
if (fd == 2)
setvbuf(stderr, NULL, _IONBF, BUFSIZ);
fd_is_interactive[fd] |= FD_SWAPPED; fd_is_interactive[fd] |= FD_SWAPPED;
return duplicate; return duplicate;
@ -547,6 +549,8 @@ static void detect_msys_tty(int fd)
!wcsstr(name, L"-pty")) !wcsstr(name, L"-pty"))
return; return;
if (fd == 2)
setvbuf(stderr, NULL, _IONBF, BUFSIZ);
fd_is_interactive[fd] |= FD_MSYS; fd_is_interactive[fd] |= FD_MSYS;
} }