Merge pull request git-for-windows#436: Merge Git for Windows v2.33.0(2)

There have been a few fixups, nothing dramatic, and we should probably update `vfs-2.33.0` to reflect those changes.

Author: derrickstolee

.github/workflows/main.yml

@@ -271,7 +271,7 @@ jobs:
       if: failure()
     - name: Upload failed tests' directories
       if: failure() && env.FAILED_TEST_ARTIFACTS != ''
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v1
       with:
         name: failed-tests-${{matrix.vector.jobname}}
         path: ${{env.FAILED_TEST_ARTIFACTS}}

compat/mingw.h

@@ -472,6 +472,7 @@ extern int (*win32_is_mount_point)(struct strbuf *path);
 #define PATH_SEP ';'
 char *mingw_query_user_email(void);
 #define query_user_email mingw_query_user_email
+struct strbuf;
 char *mingw_strbuf_realpath(struct strbuf *resolved, const char *path);
 #define platform_strbuf_realpath mingw_strbuf_realpath
 #if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)