undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/gfw-system-config-loc-fix'

Browse Source 
Update the location of system-side configuration file on Windows.

* js/gfw-system-config-loc-fix:
  config: normalize the path of the system gitconfig
  cmake(windows): set correct path to the system Git config
  mingw: move Git for Windows' system config where users expect it
This commit is contained in:
Junio C Hamano 2021-07-16 17:42:46 -07:00
commit bc34e5227b
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.c
View File

@ -1833,9 +1833,10 @@ static int git_config_from_blob_ref(config_fn_t fn,
char *git_system_config(void) char *git_system_config(void)
{ {
char *system_config = xstrdup_or_null(getenv("GIT_CONFIG_SYSTEM")); char *system_config = xstrdup_or_null(getenv("GIT_CONFIG_SYSTEM"));
if (system_config) if (!system_config)
return system_config; system_config = system_path(ETC_GITCONFIG);
return system_path(ETC_GITCONFIG); normalize_path_copy(system_config, system_config);
return system_config;
} }
void git_global_config(char **user_out, char **xdg_out) void git_global_config(char **user_out, char **xdg_out)

10
config.mak.uname
View File

@ -437,6 +437,11 @@ 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)))
# Move system config into top-level /etc/
ETC_GITCONFIG = ../etc/gitconfig
ETC_GITATTRIBUTES = ../etc/gitattributes
endif
CC = compat/vcbuild/scripts/clink.pl CC = compat/vcbuild/scripts/clink.pl
AR = compat/vcbuild/scripts/lib.pl AR = compat/vcbuild/scripts/lib.pl
@ -671,6 +676,11 @@ else
USE_LIBPCRE= YesPlease USE_LIBPCRE= YesPlease
NO_CURL = NO_CURL =
USE_NED_ALLOCATOR = YesPlease USE_NED_ALLOCATOR = YesPlease
ifeq (/mingw64,$(subst 32,64,$(prefix)))
# Move system config into top-level /etc/
ETC_GITCONFIG = ../etc/gitconfig
ETC_GITATTRIBUTES = ../etc/gitattributes
endif
else else
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
NO_CURL = YesPlease NO_CURL = YesPlease

11
contrib/buildsystems/CMakeLists.txt
View File

@ -223,8 +223,6 @@ list(APPEND compat_SOURCES sha1dc_git.c sha1dc/sha1.c sha1dc/ubc_check.c block-s
add_compile_definitions(PAGER_ENV="LESS=FRX LV=-c" add_compile_definitions(PAGER_ENV="LESS=FRX LV=-c"
ETC_GITATTRIBUTES="etc/gitattributes"
ETC_GITCONFIG="etc/gitconfig"
GIT_EXEC_PATH="libexec/git-core" GIT_EXEC_PATH="libexec/git-core"
GIT_LOCALE_PATH="share/locale" GIT_LOCALE_PATH="share/locale"
GIT_MAN_PATH="share/man" GIT_MAN_PATH="share/man"
@ -239,10 +237,15 @@ add_compile_definitions(PAGER_ENV="LESS=FRX LV=-c"
if(WIN32) if(WIN32)
set(FALLBACK_RUNTIME_PREFIX /mingw64) set(FALLBACK_RUNTIME_PREFIX /mingw64)
add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}") # Move system config into top-level /etc/
add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}"
ETC_GITATTRIBUTES="../etc/gitattributes"
ETC_GITCONFIG="../etc/gitconfig")
else() else()
set(FALLBACK_RUNTIME_PREFIX /home/$ENV{USER}) set(FALLBACK_RUNTIME_PREFIX /home/$ENV{USER})
add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}") add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}"
ETC_GITATTRIBUTES="etc/gitattributes"
ETC_GITCONFIG="etc/gitconfig")
endif() endif()