mirror of
https://github.com/git/git.git
synced 2024-11-24 02:17:02 +08:00
Merge branch 'js/mingw-isatty'
A hotfix for a topic already in 'master'. * js/mingw-isatty: mingw: make stderr unbuffered again
This commit is contained in:
commit
e048a257bf
@ -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 New Issue
Block a user