diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index a383323184bdcfb5258ed8d375ac22990f95877c..93047f5117796fb7556fa23871397e68e9f5e4c2 100644 (file)
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
die("bad sha1 reference %s", av);
}
die("bad sha1 reference %s", av);
}
-static int git_show_branch_config(const char *var, const char *value)
+static int git_show_branch_config(const char *var, const char *value, void *cb)
{
if (!strcmp(var, "showbranch.default")) {
if (!value)
{
if (!strcmp(var, "showbranch.default")) {
if (!value)
return 0;
}
return 0;
}
- return git_default_config(var, value);
+ return git_default_config(var, value, cb);
}
static int omit_in_dense(struct commit *commit, struct commit **rev, int n)
}
static int omit_in_dense(struct commit *commit, struct commit **rev, int n)
int reflog = 0;
const char *reflog_base = NULL;
int reflog = 0;
const char *reflog_base = NULL;
- git_config(git_show_branch_config);
+ git_config(git_show_branch_config, NULL);
/* If nothing is specified, try the default first */
if (ac == 1 && default_num) {
/* If nothing is specified, try the default first */
if (ac == 1 && default_num) {