averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

mingw(arm64): do move the /etc/git* location

Browse Source 
In fb5e3378f8 (mingw: move Git for Windows' system config where users
expect it, 2021-06-22), I moved the location of Git for Windows' system
config and system Git attributes file to the top-level `/etc/` directory
(because it is a much more obvious location than, say, `/mingw64/etc/`).

The patch relied on a very specific scenario that the newly-supported
Windows/ARM64 builds of `git.exe` fails to fall into. So let's broaden
the condition a bit, so that Windows/ARM64 builds also use that location
(instead of the even more obscure `/clangarm64/etc/` directory).

This fixes https://github.com/git-for-windows/git/issues/5431.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
2025-04-23 08:01:47 +00:00
committed by Junio C Hamano
parent 8945fba590
commit 619950d421
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.mak.uname
View File

@@ -489,7 +489,7 @@ ifeq ($(uname_S),Windows)
NO_POSIX_GOODIES = UnfortunatelyYes NO_POSIX_GOODIES = UnfortunatelyYes
NATIVE_CRLF = YesPlease NATIVE_CRLF = YesPlease
DEFAULT_HELP_FORMAT = html DEFAULT_HELP_FORMAT = html
ifeq (/mingw64,$(subst 32,64,$(prefix))) ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
# Move system config into top-level /etc/ # Move system config into top-level /etc/
ETC_GITCONFIG = ../etc/gitconfig ETC_GITCONFIG = ../etc/gitconfig
ETC_GITATTRIBUTES = ../etc/gitattributes ETC_GITATTRIBUTES = ../etc/gitattributes
@@ -749,7 +749,7 @@ ifeq ($(uname_S),MINGW)
ifneq (CLANGARM64,$(MSYSTEM)) ifneq (CLANGARM64,$(MSYSTEM))
USE_NED_ALLOCATOR = YesPlease USE_NED_ALLOCATOR = YesPlease
endif endif
ifeq (/mingw64,$(subst 32,64,$(prefix))) ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
# Move system config into top-level /etc/ # Move system config into top-level /etc/
ETC_GITCONFIG = ../etc/gitconfig ETC_GITCONFIG = ../etc/gitconfig
ETC_GITATTRIBUTES = ../etc/gitattributes ETC_GITATTRIBUTES = ../etc/gitattributes