git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 2/2] config: read global scope via config_sequence

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 6, 2026, 13:28 UTC
Message-ID
<xmqqa4nmm6mu.fsf@gitster.g>
In-Reply-To
<20261009-fix-config-list-global-home-and-xdg-v3-2-f936b9c8a0cc@microsoft.com>
Delilah Ashley Wu <delilahwu@linux.microsoft.com> writes:
Show 10 quoted lines
> The implementation assumes that each configuration scope corresponds to
> a single file. So during `--global` read operations, Git selects one
> file path to pass to `git_config_from_file_with_options(file)`. Because
> the global scope can come from more than one file, we should use another
> method to read the global configuration.
>
> Since `git config list --show-scope --show-origin` reads both the home
> and XDG files, there must be existing code that respects both locations,
> namely `do_git_config_sequence()` which reads from all scopes. Introduce
> an `ignore_system` flag and modify `git_config_system()` to respect it.

We do not really need to listen to your story of discovery. If you wrote this via LLM, perhaps you can ask the same LLM to tone down the verbosity a bit and shorten it by say a quarter or a half?

Show 26 quoted lines
> diff --git a/builtin/config.c b/builtin/config.c
> index 2554322317..cdef5ebb00 100644
> --- a/builtin/config.c
> +++ b/builtin/config.c
> @@ -957,6 +957,17 @@ static void location_options_init(struct config_location_options *opts,
>  	}
>  
>  	if (opts->use_global_config) {
> +		/*
> +		 * Since global config is sourced from more than one location,
> +		 * read it using `do_git_config_sequence()` with other scopes
> +		 * ignored. However, writing global config should point to a
> +		 * single destination, set in `opts->source.file`.
> +		 */
> +		opts->options.ignore_repo = 1;
> +		opts->options.ignore_cmdline = 1;
> +		opts->options.ignore_worktree = 1;
> +		opts->options.ignore_system = 1;
> ...
> @@ -1659,7 +1681,7 @@ int config_with_options(config_fn_t fn, void *data,
>  		ret = git_config_from_blob_ref(fn, repo, config_source->blob,
>  					       data, config_source->scope);
>  	} else {
> -		ret = do_git_config_sequence(opts, repo, fn, data);
> +		ret = do_git_config_sequence(opts, repo, fn, data, 0);
>  	}

THe idea to let the config sequence machinery to read only those two per-user configuration files in turn does look sensible.

Show 6 quoted lines
> -int git_config_system(void)
> +int git_config_system(const struct config_options *opts)
>  {
> -	return !git_env_bool("GIT_CONFIG_NOSYSTEM", 0);
> +	return !opts->ignore_system && !git_env_bool("GIT_CONFIG_NOSYSTEM", 0);
>  }

Existing callers of this function have all been changed to take a non-NULL opts argument. I am wondering if we want

	if (!opts)
		BUG(...);
to make sure callers don't pass NULL by mistake.
Previous: Delilah Ashley Wu
Message 32 of 32 in “config: read both home and xdg files for --global”
  1. 0/4 config: read both home and xdg files for --globalDelilah Ashley Wu via GitGitGadget, Oct 10, 2025
  2. 1/4 cleanup_path: force forward slashes on WindowsDelilah Ashley Wu via GitGitGadget, Oct 10, 2025
  3. Junio C HamanoNov 19, 2025
  4. 2/4 config: test home and xdg files in `list --global`Delilah Ashley Wu via GitGitGadget, Oct 10, 2025
  5. Junio C HamanoNov 19, 2025
  6. 3/4 config: read global scope via config_sequenceDelilah Ashley Wu via GitGitGadget, Oct 10, 2025
  7. Junio C HamanoNov 19, 2025
  8. 4/4 config: keep bailing on unreadable global filesDelilah Ashley Wu via GitGitGadget, Oct 10, 2025
  9. Kristoffer HaugsbakkOct 10, 2025
  10. Delilah Ashley WuNov 22, 2025
  11. Junio C HamanoJan 20, 2026
  12. Johannes SchindelinNov 17, 2025
  13. Junio C HamanoNov 18, 2025
  14. Junio C HamanoNov 19, 2025
  15. Delilah Ashley WuNov 22, 2025
  16. 0/3 config: read both home and xdg files for --globalDelilah Ashley Wu, Aug 23, 2026
  17. 2/3 config: let sequence require a successful fileDelilah Ashley Wu, Aug 23, 2026
  18. Junio C HamanoAug 26, 2026
  19. Delilah Ashley WuOct 9, 2026
  20. 1/3 path: use forward slashes in XDG config on WindowsDelilah Ashley Wu, Aug 23, 2026
  21. Junio C HamanoAug 26, 2026
  22. Delilah Ashley WuSep 10, 2026
  23. Delilah Ashley WuOct 9, 2026
  24. 3/3 config: read global scope via config_sequenceDelilah Ashley Wu, Aug 23, 2026
  25. Junio C HamanoAug 26, 2026
  26. Chris TorekAug 23, 2026
  27. Junio C HamanoAug 24, 2026
  28. 0/2 config: read both home and xdg files for --globalDelilah Ashley Wu, Oct 9, 2026
  29. 1/2 t1300: test list with missing global configDelilah Ashley Wu, Oct 9, 2026
  30. Junio C HamanoNov 6, 2026
  31. 2/2 config: read global scope via config_sequenceDelilah Ashley Wu, Oct 9, 2026
  32. Junio C HamanoNov 6, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.