Commit 487fc724ffa0d0260fc4c2a3ab0ea0d5d2ebe81d
2013-03-01T13:41:53
Allow empty config object and use it This removes assertions that prevent us from having an empty git_config object and then updates some tests that were dependent on global config state to use an empty config before running anything.
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
diff --git a/src/config.c b/src/config.c
index ce10508..d6aa307 100644
--- a/src/config.c
+++ b/src/config.c
@@ -426,8 +426,6 @@ static int get_string(const char **out, const git_config *cfg, const char *name)
file_internal *internal;
unsigned int i;
- assert(cfg->files.length);
-
git_vector_foreach(&cfg->files, i, internal) {
int res = get_string_at_file(out, internal->file, name);
@@ -466,8 +464,6 @@ int git_config_get_entry(const git_config_entry **out, const git_config *cfg, co
file_internal *internal;
unsigned int i;
- assert(cfg->files.length);
-
*out = NULL;
git_vector_foreach(&cfg->files, i, internal) {
@@ -488,8 +484,6 @@ int git_config_get_multivar(const git_config *cfg, const char *name, const char
int ret = GIT_ENOTFOUND;
size_t i;
- assert(cfg->files.length);
-
/*
* This loop runs the "wrong" way 'round because we need to
* look at every value from the most general to most specific
diff --git a/tests-clar/diff/patch.c b/tests-clar/diff/patch.c
index 353f3cc..77da37d 100644
--- a/tests-clar/diff/patch.c
+++ b/tests-clar/diff/patch.c
@@ -150,9 +150,8 @@ void test_diff_patch__hunks_have_correct_line_numbers(void)
g_repo = cl_git_sandbox_init("renames");
- cl_git_pass(git_repository_config(&cfg, g_repo));
- cl_git_pass(git_config_set_bool(cfg, "core.autocrlf", false));
- git_config_free(cfg);
+ cl_git_pass(git_config_new(&cfg));
+ git_repository_set_config(g_repo, cfg);
cl_git_rewritefile("renames/songof7cities.txt", new_content);
@@ -278,9 +277,8 @@ void test_diff_patch__line_counts_with_eofnl(void)
g_repo = cl_git_sandbox_init("renames");
- cl_git_pass(git_repository_config(&cfg, g_repo));
- cl_git_pass(git_config_set_bool(cfg, "core.autocrlf", false));
- git_config_free(cfg);
+ cl_git_pass(git_config_new(&cfg));
+ git_repository_set_config(g_repo, cfg);
cl_git_pass(git_futils_readbuffer(&content, "renames/songof7cities.txt"));