Merge branch 'js/config-cb'
* js/config-cb:
Provide git_config with a callback-data parameter
Conflicts:
builtin-add.c
builtin-cat-file.c
diff --git a/builtin-add.c b/builtin-add.c
index 6e4e645..1da22ee 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -207,13 +207,13 @@
OPT_END(),
};
-static int add_config(const char *var, const char *value)
+static int add_config(const char *var, const char *value, void *cb)
{
if (!strcasecmp(var, "add.ignore-errors")) {
ignore_add_errors = git_config_bool(var, value);
return 0;
}
- return git_default_config(var, value);
+ return git_default_config(var, value, cb);
}
int cmd_add(int argc, const char **argv, const char *prefix)
@@ -231,7 +231,7 @@
if (add_interactive)
exit(interactive_add(argc, argv, prefix));
- git_config(add_config);
+ git_config(add_config, NULL);
newfd = hold_locked_index(&lock_file, 1);
