Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/mingw-isatty'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 16 Feb 2017 22:45:13 +0000
(14:45 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 16 Feb 2017 22:45:13 +0000
(14:45 -0800)
A hotfix for a topic already in 'master'.
* js/mingw-isatty:
mingw: make stderr unbuffered again
1
2
compat/winansi.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
compact
(merge:
1e00c41
a4d92d5
)
diff --combined
compat/winansi.c
index 82b89ab13767a5e562d4f41826d98bce0d704e1c,dac5d01c53e52f75bc6b1d4181fe9cdf9397b2ca..793420f9d0d7732cb7dc2aa94845a22086fe7021
---
1
/
compat/winansi.c
---
2
/
compat/winansi.c
+++ b/
compat/winansi.c
@@@
-510,6
-510,8
+510,8
@@@
static HANDLE swap_osfhnd(int fd, HANDL
*/
close(new_fd);
+ if (fd == 2)
+ setvbuf(stderr, NULL, _IONBF, BUFSIZ);
fd_is_interactive[fd] |= FD_SWAPPED;
return duplicate;
@@@
-537,7
-539,7
+539,7
@@@
static void detect_msys_tty(int fd
buffer, sizeof(buffer) - 2, &result)))
return;
name = nameinfo->Name.Buffer;
- name[nameinfo->Name.Length] = 0;
+ name[nameinfo->Name.Length
/ sizeof(*name)
] = 0;
/*
* Check if this could be a MSYS2 pty pipe ('msys-XXXX-ptyN-XX')
@@@
-547,6
-549,8
+549,8
@@@
!wcsstr(name, L"-pty"))
return;
+ if (fd == 2)
+ setvbuf(stderr, NULL, _IONBF, BUFSIZ);
fd_is_interactive[fd] |= FD_MSYS;
}