git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-31 02:17:14 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Fix t0060.221 on Windows/ARM64 (#5610)

Browse Source 
Apparently my tests of https://github.com/git-for-windows/git/pull/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.
This commit is contained in:
Johannes Schindelin
2025-04-30 16:33:47 +02:00
committed by GitHub
parent eaeb5b51c3 874c21bce6
commit 92f4ffb010
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compat/mingw.c
View File

@@ -3722,10 +3722,10 @@ static void setup_windows_environment(void)
char buf[32768];
size_t off = 0;
#if defined(__MINGW64__) || defined(_M_AMD64)
setenv("MSYSTEM", "MINGW64", 1);
#elif defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
setenv("MSYSTEM", "CLANGARM64", 1);
#elif defined(__MINGW64__) || defined(_M_AMD64)
setenv("MSYSTEM", "MINGW64", 1);
#else
setenv("MSYSTEM", "MINGW32", 1);
#endif