From 4378741aade2e93a74763516f97becace9a7b248 Mon Sep 17 00:00:00 2001
From: "Dax T. Games" <dtgaes@kinggeek.org>
Date: Sat, 12 Sep 2020 06:10:41 -0400
Subject: [PATCH 1/3] add systeminfo.exe output

---
 vendor/bin/cmder_diag.cmd | 6 ++++++
 vendor/bin/cmder_diag.ps1 | 6 ++++++
 vendor/bin/cmder_diag.sh  | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/vendor/bin/cmder_diag.cmd b/vendor/bin/cmder_diag.cmd
index 9476512..66f41a1 100644
--- a/vendor/bin/cmder_diag.cmd
+++ b/vendor/bin/cmder_diag.cmd
@@ -35,6 +35,12 @@ echo where git
 echo ------------------------------------
 where git
 
+echo.
+echo ------------------------------------
+echo systeminfo
+echo ------------------------------------
+systeminfo
+
 echo.
 echo ------------------------------------
 echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
diff --git a/vendor/bin/cmder_diag.ps1 b/vendor/bin/cmder_diag.ps1
index 54ac8f6..f6ff930 100644
--- a/vendor/bin/cmder_diag.ps1
+++ b/vendor/bin/cmder_diag.ps1
@@ -33,6 +33,12 @@ write-host get-command git
 write-host ------------------------------------
 get-command git
 
+write-host ''
+write-host ------------------------------------
+write-host systeminfo
+write-host ------------------------------------
+systeminfo
+
 write-host ''
 write-host ------------------------------------
 write-host Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
diff --git a/vendor/bin/cmder_diag.sh b/vendor/bin/cmder_diag.sh
index 1630933..fa49445 100644
--- a/vendor/bin/cmder_diag.sh
+++ b/vendor/bin/cmder_diag.sh
@@ -31,7 +31,13 @@ echo ''
 echo ------------------------------------
 echo which git
 echo ------------------------------------
+
 which git
+echo ''
+echo ------------------------------------
+echo systeminfo
+echo ------------------------------------
+systeminfo
 
 echo ''
 echo ------------------------------------

From ea6e18c83473ec2d9350e50608ca18250276d242 Mon Sep 17 00:00:00 2001
From: "Dax T. Games" <dtgames@kinggeek.org>
Date: Sun, 13 Sep 2020 08:02:46 -0400
Subject: [PATCH 2/3] hide possible file write confilct

---
 vendor/lib/lib_git.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/lib/lib_git.cmd b/vendor/lib/lib_git.cmd
index 55ae56b..b405224 100644
--- a/vendor/lib/lib_git.cmd
+++ b/vendor/lib/lib_git.cmd
@@ -49,7 +49,7 @@ exit /b
 
     :: get the git version in the provided directory
 
-    "%git_executable%" --version > "%temp%\git_version.txt"
+    "%git_executable%" --version 2>nul > "%temp%\git_version.txt"
     setlocal enabledelayedexpansion
     for /F "tokens=1,2,3 usebackq" %%A in (`type "%temp%\git_version.txt" 2^>nul`) do (
         if /i "%%A %%B" == "git version" (

From 467b4d4ad913503e60e761283d12e7762cafb40a Mon Sep 17 00:00:00 2001
From: "Dax T. Games" <dtgames@kinggeek.org>
Date: Sun, 13 Sep 2020 08:27:10 -0400
Subject: [PATCH 3/3] hide possible file write conflict

---
 vendor/init.bat        | 2 +-
 vendor/lib/lib_git.cmd | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/vendor/init.bat b/vendor/init.bat
index 5604319..5d5b6ab 100644
--- a/vendor/init.bat
+++ b/vendor/init.bat
@@ -199,7 +199,7 @@ if defined GIT_INSTALL_ROOT (
 %lib_console% debug_output init.bat "Looking for Git install root..."
 
 :: get the version information for vendored git binary
-%lib_git% read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd"
+%lib_git% read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd" 2>nul
 %lib_git% validate_version VENDORED %GIT_VERSION_VENDORED%
 
 :: check if git is in path...
diff --git a/vendor/lib/lib_git.cmd b/vendor/lib/lib_git.cmd
index b405224..7788d5a 100644
--- a/vendor/lib/lib_git.cmd
+++ b/vendor/lib/lib_git.cmd
@@ -48,8 +48,7 @@ exit /b
     )
 
     :: get the git version in the provided directory
-
-    "%git_executable%" --version 2>nul > "%temp%\git_version.txt"
+    "%git_executable%" --version > "%temp%\git_version.txt"
     setlocal enabledelayedexpansion
     for /F "tokens=1,2,3 usebackq" %%A in (`type "%temp%\git_version.txt" 2^>nul`) do (
         if /i "%%A %%B" == "git version" (
@@ -272,7 +271,7 @@ exit /b
 
 :get_user_git_version
     :: get the version information for the user provided git binary
-    %lib_git% read_version USER "%test_dir%"
+    %lib_git% read_version USER "%test_dir%" 2>nul
     %lib_git% validate_version USER %GIT_VERSION_USER%
     exit  /b