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

Re: [PATCH v2 2/2] maintenance: add option to register in a specific config

From
Taylor Blau <me@ttaylorr.com>
Date
Nov 8, 2022, 20:57 UTC
Message-ID
<Y2rCsq5y9TuCfrKC@nand.local>
In-Reply-To
<448cc6ed-c441-85a3-2780-0c07e56f53f8@dunelm.org.uk>
On Tue, Nov 08, 2022 at 08:38:51PM +0000, Phillip Wood wrote:
Show 36 quoted lines
> > diff --git a/builtin/gc.c b/builtin/gc.c
> > index 24ea85c7af..1709355bce 100644
> > --- a/builtin/gc.c
> > +++ b/builtin/gc.c
> > @@ -1497,12 +1499,16 @@ static int maintenance_register(int argc, const char **argv, const char *prefix)
> >   	if (!found) {
> >   		int rc;
> > -		char *user_config, *xdg_config;
> > -		git_global_config(&user_config, &xdg_config);
> > -		if (!user_config)
> > -			die(_("$HOME not set"));
> > +		char *user_config = NULL, *xdg_config = NULL;
> > +
> > +		if (!config_file) {
> > +			git_global_config(&user_config, &xdg_config);
> > +			config_file = user_config;
>
> Here we need to decide whether to use user_config or xdg_config as the
> config file. In builtin/config.c we do this with
>
> 		if (access_or_warn(user_config, R_OK, 0) &&
> 		    xdg_config && !access_or_warn(xdg_config, R_OK, 0)) {
> 			given_config_source.file = xdg_config;
> 			free(user_config);
> 		} else {
> 			given_config_source.file = user_config;
> 			free(xdg_config);
> 		}
>
> We need something similar here (maybe we should create a helper function to
> find the appropriate file)
>
> > +			if (!user_config)
> > +				die(_("$HOME not set"));
>
> This check needs to come before deciding which config file to use

True, but that problem existed before this series, too. So the new behavior is no worse with respect to the XDG config stuff, and any improvements to that behavior can be done independently on top.

Thanks, Taylor

Previous: Phillip WoodNext: Phillip Wood
Message 5 of 10 in “git-maintenance quality-of-life improvements”
  1. 0/2 git-maintenance quality-of-life improvementsRonan Pigott, Nov 8, 2022
  2. 1/2 for-each-repo: interpolate repo path argumentsRonan Pigott, Nov 8, 2022
  3. 2/2 maintenance: add option to register in a specific configRonan Pigott, Nov 8, 2022
  4. Phillip WoodNov 8, 2022
  5. Taylor BlauNov 8, 2022
  6. Phillip WoodNov 8, 2022
  7. ronan@rjp.ieNov 8, 2022
  8. Derrick StoleeNov 9, 2022
  9. Taylor BlauNov 10, 2022
  10. Taylor BlauNov 8, 2022

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.