diff --git a/builtin-rerere.c b/builtin-rerere.c
index c607aade637423f0129167163fa4055b08546248..5c811423cc1234d933cff013f9923b45f19dc6fa 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
return write_rr(rr, fd);
}
return write_rr(rr, fd);
}
-static int git_rerere_config(const char *var, const char *value)
+static int git_rerere_config(const char *var, const char *value, void *cb)
{
if (!strcmp(var, "gc.rerereresolved"))
cutoff_resolve = git_config_int(var, value);
{
if (!strcmp(var, "gc.rerereresolved"))
cutoff_resolve = git_config_int(var, value);
else if (!strcmp(var, "rerere.enabled"))
rerere_enabled = git_config_bool(var, value);
else
else if (!strcmp(var, "rerere.enabled"))
rerere_enabled = git_config_bool(var, value);
else
- return git_default_config(var, value);
+ return git_default_config(var, value, cb);
return 0;
}
return 0;
}
{
int fd;
{
int fd;
- git_config(git_rerere_config);
+ git_config(git_rerere_config, NULL);
if (!is_rerere_enabled())
return -1;
if (!is_rerere_enabled())
return -1;