kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

config: teach repo_config to allow `repo` to be NULL 

The `repo` value can be NULL if a builtin command is run outside
any repository. The current implementation of `repo_config()` will
fail if `repo` is NULL.

If the `repo` is NULL the `repo_config()` can ignore the repository
configuration but it should read the other configuration sources like
the system-side configuration instead of failing.

Teach the `repo_config()` to allow `repo` to be NULL by calling the
`read_very_early_config()` which read config but only enumerate system
and global settings.

This will be useful in the following commits.

Suggested-by: Junio C Hamano <gitster@pobox.com>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Usman Akinyemi <usmanakinyemi202@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Usman Akinyemi 2025-03-08 05:05:00 +05:30 committed by Junio C Hamano
parent e969bc8759
commit f29f1990b5
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.c
View File

@ -2521,6 +2521,10 @@ void repo_config_clear(struct repository *repo)

void repo_config(struct repository *repo, config_fn_t fn, void *data)
{
if (!repo) {
read_very_early_config(fn, data);
return;
}
git_config_check_init(repo);
configset_iter(repo->config, fn, data);
}

9
config.h
View File

@ -219,6 +219,15 @@ void read_very_early_config(config_fn_t cb, void *data);
* repo-specific one; by overwriting, the higher-priority repo-specific
* value is left at the end).
*
* In cases where the repository variable is NULL, repo_config() will
* skip the per-repository config but retain system and global configs
* by calling read_very_early_config() which also ignores one-time
* overrides like "git -c var=val". This is to support handling "git foo -h"
* (which lets git.c:run_builtin() to pass NULL and have the cmd_foo()
* call repo_config() before calling parse_options() to notice "-h", give
* help and exit) for a command that ordinarily require a repository
* so this limitation may be OK (but if needed you are welcome to fix it).
*
* Unlike git_config_from_file(), this function respects includes.
*/
void repo_config(struct repository *r, config_fn_t fn, void *);