Use a config snapshot

22ab8881 · Edward Thomson · a3622ba6 · 22ab8881
Commit 22ab8881 authored May 20, 2014 by Edward Thomson
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/merge.c
+1 -1

No files found.
--- 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) {