Commit ebc13b2b7cfa9c5c7d3f7762666337bb4fd10d10
2014-11-02T19:16:49
Clean up issues include.path issues found during code review. * Error-handling is cleaned up to only let a file-not-found error through, not other sorts of errors. And when a file-not-found error happens, we clean up the error. * Test now checks that file-not-found introduces no error. And other minor cleanups.
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
diff --git a/src/config_file.c b/src/config_file.c
index 195ad90..d72e12c 100644
--- a/src/config_file.c
+++ b/src/config_file.c
@@ -1280,11 +1280,18 @@ static int config_parse(git_strmap *values, diskfile_backend *cfg_file, struct r
r->file_path = git_buf_detach(&path);
git_buf_init(&r->buffer, 0);
- if (git_futils_readbuffer_updated(&r->buffer, r->file_path, &r->file_mtime,
- &r->file_size, NULL) == 0) {
+ result = git_futils_readbuffer_updated(&r->buffer, r->file_path, &r->file_mtime,
+ &r->file_size, NULL);
+
+ if (result == 0) {
result = config_parse(values, cfg_file, r, level, depth+1);
r = git_array_get(cfg_file->readers, index);
}
+ else if (result == GIT_ENOTFOUND) {
+ giterr_clear();
+ result = 0;
+ }
+
git_buf_free(&r->buffer);
if (result < 0)
diff --git a/tests/config/include.c b/tests/config/include.c
index b98252d..d4af595 100644
--- a/tests/config/include.c
+++ b/tests/config/include.c
@@ -92,12 +92,13 @@ void test_config_include__missing(void)
git_config *cfg;
const char *str;
- cl_git_mkfile("included", "[include]\npath = nonexistentfile\n[foo]\nbar = baz");
+ cl_git_mkfile("including", "[include]\npath = nonexistentfile\n[foo]\nbar = baz");
- cl_git_pass(git_config_open_ondisk(&cfg, "included"));
+ giterr_clear();
+ cl_git_pass(git_config_open_ondisk(&cfg, "including"));
+ cl_assert(giterr_last() == NULL);
cl_git_pass(git_config_get_string(&str, cfg, "foo.bar"));
cl_assert_equal_s(str, "baz");
git_config_free(cfg);
- unlink("included");
}