diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-05-14 21:46:53 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-14 23:34:44 +0400 |
| commit | ef90d6d4208a5130185b04f06e5f90a5f9959fe3 (patch) | |
| tree | 1bcef191493614c192a6c690c6264ec8157ff8de /builtin-merge-recursive.c | |
| parent | 0bdf93cbf0afd568384f237378ba368e751a2f0f (diff) | |
Provide git_config with a callback-data parameter
git_config() only had a function parameter, but no callback data
parameter. This assumes that all callback functions only modify
global variables.
With this patch, every callback gets a void * parameter, and it is hoped
that this will help the libification effort.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
| -rw-r--r-- | builtin-merge-recursive.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index 910c0d20e7..e16f5e2a4e 100644 --- a/builtin-merge-recursive.c +++ b/builtin-merge-recursive.c @@ -1336,7 +1336,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); @@ -1346,7 +1346,7 @@ static int merge_config(const char *var, const char *value) 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) @@ -1367,7 +1367,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); |