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

8
diff.c
View File

@ -129,7 +129,7 @@ static int parse_funcname_pattern(const char *var, const char *ep, const char *v
* never be affected by the setting of diff.renames
* the user happens to have in the configuration file.
*/
int git_diff_ui_config(const char *var, const char *value)
int git_diff_ui_config(const char *var, const char *value, void *cb)
{
if (!strcmp(var, "diff.renamelimit")) {
diff_rename_limit_default = git_config_int(var, value);
@ -166,10 +166,10 @@ int git_diff_ui_config(const char *var, const char *value)
return parse_lldiff_command(var, ep, value);
}
return git_diff_basic_config(var, value);
return git_diff_basic_config(var, value, cb);
}
int git_diff_basic_config(const char *var, const char *value)
int git_diff_basic_config(const char *var, const char *value, void *cb)
{
if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
int slot = parse_diff_color_slot(var, 11);
@ -190,7 +190,7 @@ int git_diff_basic_config(const char *var, const char *value)
}
}
return git_color_default_config(var, value);
return git_color_default_config(var, value, cb);
}
static char *quote_two(const char *one, const char *two)