Commit 2a406ab5 by Vicent Marti

config: Fix sorting of repository config files

parent 19cb6857
...@@ -287,7 +287,7 @@ int git_repository_config( ...@@ -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( ...@@ -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;
} }
......
...@@ -189,8 +189,7 @@ BEGIN_TEST(config8, "don't fail on empty files") ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment