Merge branch 'jc/blame' (early part) into HEAD

[git.git] / builtin-blame.c

diff --git a/builtin-blame.c b/builtin-blame.c
index 5c7546db2514742851b405481373add26018756a..cf41511c798330a7e0ec02db5785747ad2b662a5 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2028,7 +2028,7 @@ static void prepare_blame_range(struct scoreboard *sb,
                usage(blame_usage);
 }
 
-static int git_blame_config(const char *var, const char *value)
+static int git_blame_config(const char *var, const char *value, void *cb)
 {
        if (!strcmp(var, "blame.showroot")) {
                show_root = git_config_bool(var, value);
@@ -2038,7 +2038,7 @@ static int git_blame_config(const char *var, const char *value)
                blank_boundary = git_config_bool(var, value);
                return 0;
        }
-       return git_default_config(var, value);
+       return git_default_config(var, value, cb);
 }
 
 /*
@@ -2238,7 +2238,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 
        cmd_is_annotate = !strcmp(argv[0], "annotate");
 
-       git_config(git_blame_config);
+       git_config(git_blame_config, NULL);
        save_commit_buffer = 0;
 
        opt = 0;