From f285d8f6785e901f21c978e3472b6afaab284cae Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@espressif.com>
Date: Tue, 12 Sep 2017 13:08:00 +1000
Subject: [PATCH] windows: Add workaround for "git submodule" stray output bug

TW10271
---
 tools/windows/windows_install_prerequisites.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/windows/windows_install_prerequisites.sh b/tools/windows/windows_install_prerequisites.sh
index b4d6337682..e2a757eaa7 100644
--- a/tools/windows/windows_install_prerequisites.sh
+++ b/tools/windows/windows_install_prerequisites.sh
@@ -35,6 +35,10 @@ pacman --noconfirm -Syu # This step may require the terminal to be closed and re
 
 pacman --noconfirm -S --needed gettext-devel gcc git make ncurses-devel flex bison gperf vim mingw-w64-i686-python2-pip unzip winpty
 
+# Workaround for errors when running "git submodule" commands
+# See https://github.com/Alexpux/MSYS2-packages/issues/735
+rm /mingw32/bin/envsubst.exe
+
 python -m pip install --upgrade pip
 
 pip install pyserial