proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-12-26 21:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a config snapshot

Browse Source
This commit is contained in:
Edward Thomson 2014-05-20 22:07:15 -07:00
parent a3622ba6cc
commit 22ab888178
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/merge.c
View File

@ -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) {