Merge branch 'js/config-cb'

[git.git] / builtin-merge-recursive.c

diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 46e636fdcf1cb854a486e425df05a2485d18d5d7..362c290028d68ebc2e589d424bc42cd5e8630a4e 100644 (file)
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -1340,7 +1340,7 @@ static struct commit *get_ref(const char *ref)
        return (struct commit *)object;
 }
 
-static int merge_config(const char *var, const char *value)
+static int merge_config(const char *var, const char *value, void *cb)
 {
        if (!strcasecmp(var, "merge.verbosity")) {
                verbosity = git_config_int(var, value);
@@ -1354,7 +1354,7 @@ static int merge_config(const char *var, const char *value)
                merge_rename_limit = git_config_int(var, value);
                return 0;
        }
-       return git_default_config(var, value);
+       return git_default_config(var, value, cb);
 }
 
 int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
@@ -1375,7 +1375,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
                        subtree_merge = 1;
        }
 
-       git_config(merge_config);
+       git_config(merge_config, NULL);
        if (getenv("GIT_MERGE_VERBOSITY"))
                verbosity = strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);