proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-12 05:16:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #876 from arrbee/new-config-locations

Browse Source 
new config file locations and defaults
This commit is contained in:
Vicent Martí 2012-08-24 15:43:19 -07:00
commit 091c742af9
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/attr.c
View File

@ -590,6 +590,18 @@ static int collect_attr_files(
return error; return error;
} }
static char *try_global_default(const char *relpath)
{
git_buf dflt = GIT_BUF_INIT;
char *rval = NULL;
if (!git_futils_find_global_file(&dflt, relpath))
rval = git_buf_detach(&dflt);
git_buf_free(&dflt);
return rval;
}
int git_attr_cache__init(git_repository *repo) int git_attr_cache__init(git_repository *repo)
{ {
@ -607,20 +619,14 @@ int git_attr_cache__init(git_repository *repo)
ret = git_config_get_string(&cache->cfg_attr_file, cfg, GIT_ATTR_CONFIG); ret = git_config_get_string(&cache->cfg_attr_file, cfg, GIT_ATTR_CONFIG);
if (ret < 0 && ret != GIT_ENOTFOUND) if (ret < 0 && ret != GIT_ENOTFOUND)
return ret; return ret;
if (ret == GIT_ENOTFOUND)
cache->cfg_attr_file = try_global_default(GIT_ATTR_CONFIG_DEFAULT);
ret = git_config_get_string(&cache->cfg_excl_file, cfg, GIT_IGNORE_CONFIG); ret = git_config_get_string(&cache->cfg_excl_file, cfg, GIT_IGNORE_CONFIG);
if (ret < 0 && ret != GIT_ENOTFOUND) if (ret < 0 && ret != GIT_ENOTFOUND)
return ret; return ret;
if (ret == GIT_ENOTFOUND)
if (ret == GIT_ENOTFOUND) { cache->cfg_excl_file = try_global_default(GIT_IGNORE_CONFIG_DEFAULT);
git_buf dflt = GIT_BUF_INIT;
ret = git_futils_find_global_file(&dflt, GIT_IGNORE_CONFIG_DEFAULT);
if (!ret)
cache->cfg_excl_file = git_buf_detach(&dflt);
git_buf_free(&dflt);
}
giterr_clear(); giterr_clear();

1
src/attr.h
View File

@ -11,6 +11,7 @@
#include "strmap.h" #include "strmap.h"
#define GIT_ATTR_CONFIG "core.attributesfile" #define GIT_ATTR_CONFIG "core.attributesfile"
#define GIT_ATTR_CONFIG_DEFAULT ".config/git/attributes"
#define GIT_IGNORE_CONFIG "core.excludesfile" #define GIT_IGNORE_CONFIG "core.excludesfile"
#define GIT_IGNORE_CONFIG_DEFAULT ".config/git/ignore" #define GIT_IGNORE_CONFIG_DEFAULT ".config/git/ignore"

7
src/config.c
View File

@ -449,7 +449,12 @@ int git_config_set_multivar(git_config *cfg, const char *name, const char *regex
int git_config_find_global_r(git_buf *path) int git_config_find_global_r(git_buf *path)
{ {
return git_futils_find_global_file(path, GIT_CONFIG_FILENAME); int error = git_futils_find_global_file(path, GIT_CONFIG_FILENAME);
if (error == GIT_ENOTFOUND)
error = git_futils_find_global_file(path, GIT_CONFIG_FILENAME_ALT);
return error;
} }
int git_config_find_global(char *global_config_path, size_t length) int git_config_find_global(char *global_config_path, size_t length)

1
src/config.h
View File

@ -13,6 +13,7 @@
#include "repository.h" #include "repository.h"
#define GIT_CONFIG_FILENAME ".gitconfig" #define GIT_CONFIG_FILENAME ".gitconfig"
#define GIT_CONFIG_FILENAME_ALT ".config/git/config"
#define GIT_CONFIG_FILENAME_INREPO "config" #define GIT_CONFIG_FILENAME_INREPO "config"
#define GIT_CONFIG_FILENAME_SYSTEM "gitconfig" #define GIT_CONFIG_FILENAME_SYSTEM "gitconfig"
#define GIT_CONFIG_FILE_MODE 0666 #define GIT_CONFIG_FILE_MODE 0666