mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/config-cb'

Browse Source 
* js/config-cb:
  Provide git_config with a callback-data parameter

Conflicts:

	builtin-add.c
	builtin-cat-file.c
This commit is contained in:
Junio C Hamano
2008-05-25 14:25:02 -07:00
parent 450c5aed06 ef90d6d420
commit 9bd81e4249
75 changed files with 179 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-add.c
View File

@ -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);