Skip to content

Commit 92f4ffb

Browse files
authored
Fix t0060.221 on Windows/ARM64 (#5610)
Apparently my tests of #5586 had been incomplete. This here patch is needed to let t0060.221 pass (where it verifies that `git.exe` sets `MSYSTEM` correctly if that environment variable has not yet been set): Simply reverse the order of the tests whether to set `MINGW64` or `CLANGARM64` to avoid using the former on Windows/ARM64 by mistake.
2 parents eaeb5b5 + 874c21b commit 92f4ffb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

compat/mingw.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3722,10 +3722,10 @@ static void setup_windows_environment(void)
37223722
char buf[32768];
37233723
size_t off = 0;
37243724

3725-
#if defined(__MINGW64__) || defined(_M_AMD64)
3726-
setenv("MSYSTEM", "MINGW64", 1);
3727-
#elif defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
3725+
#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
37283726
setenv("MSYSTEM", "CLANGARM64", 1);
3727+
#elif defined(__MINGW64__) || defined(_M_AMD64)
3728+
setenv("MSYSTEM", "MINGW64", 1);
37293729
#else
37303730
setenv("MSYSTEM", "MINGW32", 1);
37313731
#endif

0 commit comments

Comments
 (0)