path: root/builtin-show-branch.c
diff options
authorJohannes Schindelin <>2008-05-14 17:46:53 (GMT)
committerJunio C Hamano <>2008-05-14 19:34:44 (GMT)
commitef90d6d4208a5130185b04f06e5f90a5f9959fe3 (patch)
tree1bcef191493614c192a6c690c6264ec8157ff8de /builtin-show-branch.c
parent0bdf93cbf0afd568384f237378ba368e751a2f0f (diff)
Provide git_config with a callback-data parameter
git_config() only had a function parameter, but no callback data parameter. This assumes that all callback functions only modify global variables. With this patch, every callback gets a void * parameter, and it is hoped that this will help the libification effort. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin-show-branch.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 019abd3..ee4269d 100644
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -533,7 +533,7 @@ static void append_one_rev(const char *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)
@@ -547,7 +547,7 @@ static int git_show_branch_config(const char *var, const char *value)
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)
@@ -611,7 +611,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
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) {