Commit 8b4f9b17580c52ac2b1f2f42f5c53116fb763436
2012-09-24T18:59:00
Correctly read xdr compatible %HOME%/.config/git/config config file This file is not just read if the global config file (%HOME%/.gitconfig) is not found, however, it is used everytime but with lower priority. Signed-off-by: Sven Strickroth <email@cs-ware.de>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116
diff --git a/include/git2/config.h b/include/git2/config.h
index 21d8a0b..a3202c2 100644
--- a/include/git2/config.h
+++ b/include/git2/config.h
@@ -61,6 +61,9 @@ typedef struct {
* may be used on any `git_config` call to load the
* global configuration file.
*
+ * This method will not guess the path to the xdr compatible
+ * config file (.config/git/config).
+ *
* @param global_config_path Buffer of GIT_PATH_MAX length to store the path
* @return 0 if a global configuration file has been
* found. Its path will be stored in `buffer`.
@@ -68,6 +71,23 @@ typedef struct {
GIT_EXTERN(int) git_config_find_global(char *global_config_path, size_t length);
/**
+ * Locate the path to the global xdr compatible configuration file
+ *
+ * The xdr compatible configuration file is usually
+ * located in `$HOME/.config/git/config`.
+ *
+ * This method will try to guess the full path to that
+ * file, if the file exists. The returned path
+ * may be used on any `git_config` call to load the
+ * global configuration file.
+ *
+ * @param global_config_path Buffer of GIT_PATH_MAX length to store the path
+ * @return 0 if a global configuration file has been
+ * found. Its path will be stored in `buffer`.
+ */
+GIT_EXTERN(int) git_config_find_xdr(char *global_config_path, size_t length);
+
+/**
* Locate the path to the system configuration file
*
* If /etc/gitconfig doesn't exist, it will look for
diff --git a/src/config.c b/src/config.c
index e62dccf..b3d6fc6 100644
--- a/src/config.c
+++ b/src/config.c
@@ -451,8 +451,12 @@ int git_config_find_global_r(git_buf *path)
{
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_xdr_r(git_buf *path)
+{
+ int error = git_futils_find_global_file(path, GIT_CONFIG_FILENAME_ALT);
return error;
}
diff --git a/src/repository.c b/src/repository.c
index 1a46db0..3906cb3 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -445,6 +445,7 @@ static int load_config(
git_config **out,
git_repository *repo,
const char *global_config_path,
+ const char *xdr_config_path,
const char *system_config_path)
{
git_buf config_path = GIT_BUF_INIT;
@@ -459,13 +460,18 @@ static int load_config(
&config_path, repo->path_repository, GIT_CONFIG_FILENAME_INREPO) < 0)
goto on_error;
- if (git_config_add_file_ondisk(cfg, config_path.ptr, 3) < 0)
+ if (git_config_add_file_ondisk(cfg, config_path.ptr, 4) < 0)
goto on_error;
git_buf_free(&config_path);
if (global_config_path != NULL) {
- if (git_config_add_file_ondisk(cfg, global_config_path, 2) < 0)
+ if (git_config_add_file_ondisk(cfg, global_config_path, 3) < 0)
+ goto on_error;
+ }
+
+ if (xdr_config_path != NULL) {
+ if (git_config_add_file_ondisk(cfg, xdr_config_path, 3) < 0)
goto on_error;
}
@@ -487,19 +493,23 @@ on_error:
int git_repository_config__weakptr(git_config **out, git_repository *repo)
{
if (repo->_config == NULL) {
- git_buf global_buf = GIT_BUF_INIT, system_buf = GIT_BUF_INIT;
+ git_buf global_buf = GIT_BUF_INIT, xdr_buf = GIT_BUF_INIT, system_buf = GIT_BUF_INIT;
int res;
const char *global_config_path = NULL;
+ const char *xdr_config_path = NULL;
const char *system_config_path = NULL;
if (git_config_find_global_r(&global_buf) == 0)
global_config_path = global_buf.ptr;
+ if (git_config_find_xdr_r(&xdr_buf) == 0)
+ xdr_config_path = xdr_buf.ptr;
+
if (git_config_find_system_r(&system_buf) == 0)
system_config_path = system_buf.ptr;
- res = load_config(&repo->_config, repo, global_config_path, system_config_path);
+ res = load_config(&repo->_config, repo, global_config_path, xdr_config_path, system_config_path);
git_buf_free(&global_buf);
git_buf_free(&system_buf);