diff --git a/BRANCH_TODO b/BRANCH_TODO
index 3275c48a5..037def219 100644
--- a/BRANCH_TODO
+++ b/BRANCH_TODO
@@ -1,4 +1,6 @@
  * glibc .so files
+   - without stage1 c++ code integration it should fail with a better error message
+     instead of lld not getting the object file on the linker line for some reason.
    - stage1 C++ code integration
    - ok file
  * use hex for cache hash file paths
diff --git a/ci/azure/windows_mingw_script b/ci/azure/windows_mingw_script
index f7cecf96c..a6bfd8147 100644
--- a/ci/azure/windows_mingw_script
+++ b/ci/azure/windows_mingw_script
@@ -7,6 +7,11 @@ pacman --noconfirm --needed -S git base-devel mingw-w64-x86_64-toolchain mingw-w
 
 git config core.abbrev 9
 
+# Git is wrong for autocrlf being enabled by default on Windows.
+# git is mangling files on Windows by default.
+# This is the second bug I've tracked down to being caused by autocrlf.
+git config core.autocrlf false
+
 ZIGBUILDDIR="$(pwd)/build"
 PREFIX="$ZIGBUILDDIR/dist"
 CMAKEFLAGS="-DCMAKE_COLOR_MAKEFILE=OFF -DCMAKE_INSTALL_PREFIX=$PREFIX -DZIG_STATIC=ON"
@@ -18,8 +23,4 @@ cmake .. -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=RelWithDebInfo $CMAKEFLAGS -DCMA
 
 make -j$(nproc) install
 
-# I saw a failure due to `git diff` being > 400 KB instead of empty as expected so this is to debug it.
-git status
-git diff | head -n100
-
 ./zig build test-behavior -Dskip-non-native -Dskip-release