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

squash! Merge pull request #104 from dscho/super-config

Browse Source 
Back out the super-config branch in favor of the program-data-config
branch (which is a better version of the same feature).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2015-05-27 18:51:22 +00:00
parent 59bd1a9382
commit 9967f9f669
5 changed files with 1 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config.txt
View File

@@ -6,9 +6,7 @@ the Git commands' behavior. The `.git/config` file in each repository
is used to store the configuration for that repository, and
`$HOME/.gitconfig` is used to store a per-user configuration as
fallback values for the `.git/config` file. The file `/etc/gitconfig`
can be used to store a system-wide default configuration. On Windows,
configuration can also be stored in `C:\ProgramData\Git\config`; This
file will be used also by libgit2-based software.
can be used to store a system-wide default configuration.
The configuration variables are used by both the Git plumbing
and the porcelains. The variables are divided into sections, wherein

18
compat/mingw.c
View File

@@ -1,7 +1,6 @@
#include "../git-compat-util.h"
#include "win32.h"
#include <conio.h>
#include <shlobj.h>
#include <wchar.h>
#include <winioctl.h>
#include "../strbuf.h"
@@ -2655,20 +2654,3 @@ 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

@@ -390,8 +390,6 @@ 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,18 +1204,11 @@ 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

@@ -310,10 +310,6 @@ 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_config
#define git_super_config() NULL
#endif
#if defined(__HP_cc) && (__HP_cc >= 61000)
#define NORETURN __attribute__((noreturn))
#define NORETURN_PTR