From 2a406ab51c33059f49a5a9105be07b3a1f8210f4 Mon Sep 17 00:00:00 2001 From: Vicent Marti Date: Sat, 18 Jun 2011 02:08:56 +0200 Subject: [PATCH] config: Fix sorting of repository config files --- src/repository.c | 4 ++-- tests/t15-config.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/repository.c b/src/repository.c index bcf393263..1fef73907 100644 --- a/src/repository.c +++ b/src/repository.c @@ -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; } diff --git a/tests/t15-config.c b/tests/t15-config.c index 5e5b4b14d..63fe8e100 100644 --- a/tests/t15-config.c +++ b/tests/t15-config.c @@ -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;