git-cvsimport: do not fail when CVSROOT is /

diff --git a/builtin-add.c b/builtin-add.c
index 6e4e645cb7ba1624825fac9ff3f1d9bce5e93689..1da22eec915539f06a4dfc1e4bb1d18482de0ede 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -207,13 +207,13 @@ static struct option builtin_add_options[] = {
        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 @@ int cmd_add(int argc, const char **argv, const char *prefix)
        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);