diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-06 21:54:48 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-06 21:54:48 +0300 |
| commit | b3d1c85d4833aef546f11e4d37516a1ececaefc3 (patch) | |
| tree | b5e799c3279f98f5172ce18cfd0e9b317e9822dd /worktree.c | |
| parent | 1d76e69212102c3373b552186590b76d6ad8d84c (diff) | |
| parent | 6e8e7981eb86e2c19401825dbdb55d5860d11313 (diff) | |
Merge branch 'gc/config-context'
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
Diffstat (limited to 'worktree.c')
| -rw-r--r-- | worktree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/worktree.c b/worktree.c index b4b01340a0..1b84e3a34d 100644 --- a/worktree.c +++ b/worktree.c @@ -836,7 +836,7 @@ int init_worktree_config(struct repository *r) * Relocate that value to avoid breaking all worktrees with this * upgrade to worktree config. */ - if (!git_configset_get_value(&cs, "core.worktree", &core_worktree)) { + if (!git_configset_get_value(&cs, "core.worktree", &core_worktree, NULL)) { if ((res = move_config_setting("core.worktree", core_worktree, common_config_file, main_worktree_file))) |