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

config: Fix sorting of repository config files

Browse Source
This commit is contained in:
Vicent Marti 2011-06-18 02:08:56 +02:00
parent 19cb6857a4
commit 2a406ab51c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/repository.c
View File

@ -287,7 +287,7 @@ int git_repository_config(
return error; return error;
git__joinpath(config_path, repo->path_repository, GIT_CONFIG_FILENAME_INREPO); git__joinpath(config_path, repo->path_repository, GIT_CONFIG_FILENAME_INREPO);
error = git_config_add_file_ondisk(*out, config_path, 1); error = git_config_add_file_ondisk(*out, config_path, 3);
if (error < GIT_SUCCESS) if (error < GIT_SUCCESS)
goto cleanup; goto cleanup;
@ -298,7 +298,7 @@ int git_repository_config(
} }
if (system_config_path != NULL) { if (system_config_path != NULL) {
error = git_config_add_file_ondisk(*out, system_config_path, 3); error = git_config_add_file_ondisk(*out, system_config_path, 1);
if (error < GIT_SUCCESS) if (error < GIT_SUCCESS)
goto cleanup; goto cleanup;
} }

3
tests/t15-config.c
View File

@ -189,8 +189,7 @@ BEGIN_TEST(config8, "don't fail on empty files")
git_config_free(cfg); git_config_free(cfg);
END_TEST END_TEST
BEGIN_TEST BEGIN_TEST(config9, "replace a value")
(config9, "replace a value")
git_config *cfg; git_config *cfg;
int i; int i;