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

Merge branch 'gc/config-context'

Browse Source 
Reduce reliance on a global state in the config reading API.

* gc/config-context:
  config: pass source to config_parser_event_fn_t
  config: add kvi.path, use it to evaluate includes
  config.c: remove config_reader from configsets
  config: pass kvi to die_bad_number()
  trace2: plumb config kvi
  config.c: pass ctx with CLI config
  config: pass ctx with config files
  config.c: pass ctx in configsets
  config: add ctx arg to config_fn_t
  urlmatch.h: use config_fn_t type
  config: inline git_color_default_config
This commit is contained in:
Junio C Hamano
2023-07-06 11:54:48 -07:00
parent 1d76e69212 6e8e7981eb
commit b3d1c85d48
103 changed files with 960 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xdiff-interface.c
View File

@ -308,7 +308,8 @@ int xdiff_compare_lines(const char *l1, long s1,
int git_xmerge_style = -1;
int git_xmerge_config(const char *var, const char *value, void *cb)
int git_xmerge_config(const char *var, const char *value,
const struct config_context *ctx, void *cb)
{
if (!strcmp(var, "merge.conflictstyle")) {
if (!value)
@ -328,5 +329,5 @@ int git_xmerge_config(const char *var, const char *value, void *cb)
value, var);
return 0;
}
return git_default_config(var, value, cb);
return git_default_config(var, value, ctx, cb);
}