Start the 2.46 cycle

[thirdparty/git.git] / worktree.c

diff --git a/worktree.c b/worktree.c
index b02a05a74a341157fa8dff7da22936127bebf18e..cf5eea8c931a0cea85499aab6d24e5cbd392d839 100644 (file)
--- a/worktree.c
+++ b/worktree.c
@@ -807,9 +807,9 @@ int should_prune_worktree(const char *id, struct strbuf *reason, char **wtpath,
 static int move_config_setting(const char *key, const char *value,
                               const char *from_file, const char *to_file)
 {
-       if (git_config_set_in_file_gently(to_file, key, value))
+       if (git_config_set_in_file_gently(to_file, key, NULL, value))
                return error(_("unable to set %s in '%s'"), key, to_file);
-       if (git_config_set_in_file_gently(from_file, key, NULL))
+       if (git_config_set_in_file_gently(from_file, key, NULL, NULL))
                return error(_("unable to unset %s in '%s'"), key, from_file);
        return 0;
 }