From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Feb 2017 22:45:13 +0000 (-0800)
Subject: Merge branch 'js/mingw-isatty'
X-Git-Tag: v2.12.0-rc2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e048a257bfe66e6eead5e212b5449ffd108de707?ds=inline;hp=-c

Merge branch 'js/mingw-isatty'

A hotfix for a topic already in 'master'.

* js/mingw-isatty:
mingw: make stderr unbuffered again
---

e048a257bfe66e6eead5e212b5449ffd108de707
diff --combined compat/winansi.c
index 82b89ab137,dac5d01c53..793420f9d0
--- a/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;
  }