global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-10 17:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows: add support for a Windows-wide configuration

Browse Source 
Between the libgit2 and the Git for Windows project, there has been a
discussion how we could share Git configuration to avoid duplication (or
worse: skew).

Earlier, libgit2 was nice enough to just re-use Git for Windows'

	C:\Program Files (x86)\Git\etc\gitconfig

but with the upcoming Git for Windows 2.x, there would be more paths to
search, as we will have 64-bit and 32-bit versions, and the
corresponding config files will be in %PROGRAMFILES%\Git\mingw64\etc and
...\mingw32\etc, respectively.

Therefore we came to a consensus to use %PROGRAMDATA%\Git as the
location for Git-specific files that are of wider interest than just Git
for Windows.

On XP, there is no %PROGRAMDATA%, therefore we need to use
"%ALLUSERSPROFILE%\Application Data\Git\config" in those setups.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2015-04-22 14:47:27 +01:00
parent 4c0c4bfbc6
commit d37ead55e4
4 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
compat/mingw.c
View File

@@ -1,6 +1,7 @@
#include "../git-compat-util.h"
#include "win32.h"
#include <conio.h>
#include <shlobj.h>
#include <wchar.h>
#include "../strbuf.h"
#include "../run-command.h"
@@ -2371,3 +2372,20 @@ void mingw_startup()
/* init length of current directory for handle_long_path */
current_directory_len = GetCurrentDirectoryW(0, NULL);
}
const char *windows_wide_config(void)
{
static struct strbuf windows_wide = STRBUF_INIT;
if (!windows_wide.len) {
wchar_t wbuffer[MAX_PATH];
if (SHGetFolderPathW(NULL, CSIDL_COMMON_APPDATA, NULL,
SHGFP_TYPE_CURRENT, wbuffer) != S_OK)
strbuf_addch(&windows_wide, '\0');
else {
char buffer[MAX_PATH];
xwcstoutf(buffer, wbuffer, sizeof(buffer));
strbuf_addf(&windows_wide, "%s\\Git\\config", buffer);
}
}
return *windows_wide.buf ? windows_wide.buf : NULL;
}

2
compat/mingw.h
View File

@@ -392,6 +392,8 @@ static inline char *mingw_find_last_dir_sep(const char *path)
int mingw_offset_1st_component(const char *path);
#define offset_1st_component mingw_offset_1st_component
#define PATH_SEP ';'
extern const char *windows_wide_config(void);
#define git_super_config windows_wide_config
#ifndef __MINGW64_VERSION_MAJOR
#define PRIuMAX "I64u"
#define PRId64 "I64d"

7
config.c
View File

@@ -1204,11 +1204,18 @@ int git_config_system(void)
int git_config_early(config_fn_t fn, void *data, const char *repo_config)
{
int ret = 0, found = 0;
const char *super_config = git_super_config();
char *xdg_config = NULL;
char *user_config = NULL;
home_config_paths(&user_config, &xdg_config, "config");
if (super_config && git_config_system() &&
!access(super_config, R_OK)) {
ret += git_config_from_file(fn, super_config, data);
found += 1;
}
if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0)) {
ret += git_config_from_file(fn, git_etc_gitconfig(),
data);

4
git-compat-util.h
View File

@@ -303,6 +303,10 @@ static inline char *git_find_last_dir_sep(const char *path)
#define find_last_dir_sep git_find_last_dir_sep
#endif
#ifndef git_super_gitconfig
#define git_super_gitconfig NULL
#endif
#if defined(__HP_cc) && (__HP_cc >= 61000)
#define NORETURN __attribute__((noreturn))
#define NORETURN_PTR