Commit c1524b2e1c6acaa9c3de362bbc92935e997c409c
2018-02-28T11:33:11
config: move the repository to the diskfile header We pass this around and when creating a new iterator we need to read the repository pointer. Put it in a common place so we can reach it regardless of whether we got a full object or a snapshot.
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 792a3de..4d13999 100644
--- a/src/config_file.c
+++ b/src/config_file.c
@@ -86,13 +86,13 @@ typedef struct {
/* mutex to coordinate accessing the values */
git_mutex values_mutex;
refcounted_strmap *values;
+ const git_repository *repo;
} diskfile_header;
typedef struct {
diskfile_header header;
git_config_level_t level;
- const git_repository *repo;
git_array_t(git_config_parser) readers;
@@ -271,7 +271,7 @@ static int config_open(git_config_backend *cfg, git_config_level_t level, const
diskfile_backend *b = (diskfile_backend *)cfg;
b->level = level;
- b->repo = repo;
+ b->header.repo = repo;
if ((res = refcounted_strmap_alloc(&b->header.values)) < 0)
return res;
@@ -343,7 +343,7 @@ static int config_refresh(git_config_backend *cfg)
}
git_array_clear(b->file.includes);
- if ((error = config_read(values->values, b->repo, &b->file, b->level, 0)) < 0)
+ if ((error = config_read(values->values, b->header.repo, &b->file, b->level, 0)) < 0)
goto out;
if ((error = git_mutex_lock(&b->header.values_mutex)) < 0) {
@@ -423,7 +423,7 @@ static int config_iterator_new(
if ((error = config_snapshot(&snapshot, backend)) < 0)
return error;
- if ((error = snapshot->open(snapshot, b->level, b->repo)) < 0)
+ if ((error = snapshot->open(snapshot, b->level, b->header.repo)) < 0)
return error;
it = git__calloc(1, sizeof(git_config_file_iter));