config: Fix sorting of repository config files

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

View File

@ -287,7 +287,7 @@ int git_repository_config(
return error;
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)
goto cleanup;
@ -298,7 +298,7 @@ int git_repository_config(
}
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)
goto cleanup;
}

View File

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