diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-05-25 14:25:02 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 14:25:02 -0700 |
commit | 9bd81e4249a419f9cde8fd68e033e263533f4914 (patch) | |
tree | 5a4c77cc648dc720e40c76e83a489ab40e70e187 /builtin-add.c | |
parent | 450c5aed06ecf60084f993f688b549ffa377b64e (diff) | |
parent | ef90d6d4208a5130185b04f06e5f90a5f9959fe3 (diff) | |
download | git-9bd81e4249a419f9cde8fd68e033e263533f4914.tar.gz |
Merge branch 'js/config-cb'v1.5.6-rc0
* js/config-cb:
Provide git_config with a callback-data parameter
Conflicts:
builtin-add.c
builtin-cat-file.c
Diffstat (limited to 'builtin-add.c')
-rw-r--r-- | builtin-add.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-add.c b/builtin-add.c index 6e4e645cb7..1da22eec91 100644 --- 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); |