diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-05-20 22:07:15 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-05-27 20:49:22 -0500 |
| commit | 22ab8881787f00eec479e1f148a3846a67c9bcfe (patch) | |
| tree | fcdd551087469c2f4fb704b963377eb3590b7cde | |
| parent | a3622ba6cc0970abe485baa98ab53e32df28cfdc (diff) | |
| download | libgit2-22ab8881787f00eec479e1f148a3846a67c9bcfe.tar.gz | |
Use a config snapshot
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 02851e526..54c7660db 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2572,7 +2572,7 @@ int merge_config(git_merge_config_t *out, git_repository *repo) *out = GIT_MERGE_CONFIG_NONE; - if ((error = git_repository_config(&config, repo)) < 0) + if ((error = git_repository_config_snapshot(&config, repo)) < 0) goto done; if ((error = git_config_get_string(&value, config, "merge.ff")) < 0) { |