diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-06-04 17:31:42 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-06-04 17:31:42 +0200 |
| commit | 57cb1179e5c9c8f5c27c9115f13f1cae5d0f87a0 (patch) | |
| tree | 67871086b1437dcd410979b423cd3ba140ab9257 /tests/merge/files.c | |
| parent | 90befde4a1938641dfdb9a7bdb9f361d1de5c26f (diff) | |
| download | libgit2-cmn/config-default-snapshot.tar.gz | |
Make the default repository config getter return a snapshotcmn/config-default-snapshot
You should always use a snapshot, with the sole exception of writing to
the configuration.
Any reads that are not against a snapshot have race conditions, both in
terms of returned values as well as dangling pointers.
Diffstat (limited to 'tests/merge/files.c')
| -rw-r--r-- | tests/merge/files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/merge/files.c b/tests/merge/files.c index c377471e2..adf4e02c2 100644 --- a/tests/merge/files.c +++ b/tests/merge/files.c @@ -22,7 +22,7 @@ void test_merge_files__initialize(void) git_repository_index(&repo_index, repo); /* Ensure that the user's merge.conflictstyle doesn't interfere */ - cl_git_pass(git_repository_config(&cfg, repo)); + cl_git_pass(git_repository_config_writable(&cfg, repo)); cl_git_pass(git_config_set_string(cfg, "merge.conflictstyle", "merge")); git_config_free(cfg); } |