Merge pull request #2469 from aloucks/msys-disable-color

Disable broken color in MSYS2 shells.

src/utils/tty.rs

@@ -4,8 +4,6 @@ pub fn stderr_isatty() -> bool {
     isatty(libc::STDERR_FILENO)
 }
 
-// FIXME: Unfortunately this doesn't detect msys terminals so rustup
-// is always colorless there (just like rustc and cargo).
 #[cfg(windows)]
 pub fn stderr_isatty() -> bool {
     isatty(winapi::um::winbase::STD_ERROR_HANDLE)
@@ -30,6 +28,11 @@ fn isatty(fd: libc::c_int) -> bool {
 #[inline]
 #[cfg(windows)]
 fn isatty(fd: winapi::shared::minwindef::DWORD) -> bool {
+    if std::env::var("MSYSTEM").is_ok() {
+        // FIXME: No color is better than broken color codes in MSYS shells
+        //        https://github.com/rust-lang/rustup/issues/2292
+        return false;
+    }
     use winapi::um::{consoleapi::GetConsoleMode, processenv::GetStdHandle};
     unsafe {
         let handle = GetStdHandle(fd);