diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 2febfb919b..1dbd4f51af 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -12,6 +12,7 @@ jobs:
     env:
       GITPULLOPTIONS: --no-tags origin ${{github.ref}}
       VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat
+      PATCH: C:\msys64\usr\bin\patch.exe
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - run: md build
@@ -39,6 +40,8 @@ jobs:
           choco install --no-progress winflexbison3 --version=2.5.18.20190508
       - name: git config
         run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
           git config --global advice.detachedHead 0
       - uses: actions/checkout@v2
         with:
diff --git a/appveyor.yml b/appveyor.yml
index d31d4b2df9..6b9e6e9e34 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,6 +3,9 @@ version: '{build}'
 init:
   - git config --global user.name git
   - git config --global user.email svn-admin@ruby-lang.org
+  - git config --global core.autocrlf false
+  - git config --global core.eol lf
+  - git config --global advice.detachedHead 0
 clone_depth: 10
 platform:
   - x64