diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-10-23 18:58:39 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-10-23 18:58:39 +0200 |
| commit | 4bb6ffb6bb8ad9d49eb173350be965183cd09c96 (patch) | |
| tree | 6e5a2d0cb8df338e5359c7342e845e31e9d9fa65 | |
| parent | d676af43da6603f1b31fb6d2d3eb02793b260ad0 (diff) | |
| parent | ad5adacb1d1913620f022d7bb6c9b877ff3a4faf (diff) | |
| download | libgit2-4bb6ffb6bb8ad9d49eb173350be965183cd09c96.tar.gz | |
Merge pull request #2622 from libgit2/refresh-config-snapshot
Refresh git configuration before looking for the tracking branch redux.
| -rw-r--r-- | src/config_file.c | 7 | ||||
| -rw-r--r-- | tests/config/snapshot.c | 15 |
2 files changed, 20 insertions, 2 deletions
diff --git a/src/config_file.c b/src/config_file.c index 8f55c42f3..1f73e7e11 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -767,12 +767,17 @@ static int config_readonly_open(git_config_backend *cfg, git_config_level_t leve { diskfile_readonly_backend *b = (diskfile_readonly_backend *) cfg; diskfile_backend *src = b->snapshot_from; + diskfile_header *src_header = &src->header; refcounted_strmap *src_map; + int error; + + if (!src_header->readonly && (error = config_refresh(&src_header->parent)) < 0) + return error; /* We're just copying data, don't care about the level */ GIT_UNUSED(level); - src_map = refcounted_strmap_take(&src->header); + src_map = refcounted_strmap_take(src_header); b->header.values = src_map; return 0; diff --git a/tests/config/snapshot.c b/tests/config/snapshot.c index c9f15921a..e47e252ac 100644 --- a/tests/config/snapshot.c +++ b/tests/config/snapshot.c @@ -3,7 +3,7 @@ void test_config_snapshot__create_snapshot(void) { int32_t tmp; - git_config *cfg, *snapshot; + git_config *cfg, *snapshot, *new_snapshot; const char *filename = "config-ext-change"; cl_git_mkfile(filename, "[old]\nvalue = 5\n"); @@ -23,6 +23,19 @@ void test_config_snapshot__create_snapshot(void) cl_git_pass(git_config_get_int32(&tmp, snapshot, "old.value")); cl_assert_equal_i(5, tmp); + + /* Change the value on the file itself (simulate external process) */ + cl_git_mkfile(filename, "[old]\nvalue = 999\n"); + + cl_git_pass(git_config_snapshot(&new_snapshot, cfg)); + + /* New snapshot should see new value */ + cl_git_pass(git_config_get_int32(&tmp, new_snapshot, "old.value")); + cl_assert_equal_i(999, tmp); + + /* Old snapshot should still have the old value */ + cl_git_pass(git_config_get_int32(&tmp, snapshot, "old.value")); + cl_assert_equal_i(5, tmp); git_config_free(snapshot); git_config_free(cfg); |